Merge pull request #61 from JamesH65/raw_rgb

Added the option to save the raw data as RGB888.

Author: popcornmix

host_applications/linux/apps/raspicam/RaspiStillYUV.c

@@ -27,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 /*
- * \file RaspiStill.c
- * Command line program to capture a still frame and encode it to file.
+ * \file RaspiStillYUV.c
+ * Command line program to capture a still frame and dump uncompressed it to file.
  * Also optionally display a preview/viewfinder of current camera input.
  *
  * \date 4th March 2013
@@ -102,6 +102,7 @@ typedef struct
    char *filename;                     /// filename of output file
    int verbose;                        /// !0 if want detailed run information
    int timelapse;                      /// Delay between each picture in timelapse mode. If 0, disable timelapse
+   int useRGB;                         /// Output RGB data rather than YUV
 
    RASPIPREVIEW_PARAMETERS preview_parameters;    /// Preview setup parameters
    RASPICAM_CAMERA_PARAMETERS camera_parameters; /// Camera setup parameters
@@ -131,6 +132,7 @@ static void display_valid_parameters(char *app_name);
 #define CommandVerbose      4
 #define CommandTimeout      5
 #define CommandTimelapse    6
+#define CommandUseRGB       7
 
 static COMMAND_LIST cmdline_commands[] =
 {
@@ -141,6 +143,7 @@ static COMMAND_LIST cmdline_commands[] =
    { CommandVerbose, "-verbose",    "v",  "Output verbose information during run", 0 },
    { CommandTimeout, "-timeout",    "t",  "Time (in ms) before takes picture and shuts down. If not specified set to 5s", 1 },
    { CommandTimelapse,"-timelapse", "tl", "Timelapse mode. Takes a picture every <t>ms", 1},
+   { CommandUseRGB,  "-rgb",        "rgb","Save as RGB data rather than YUV", 0},
 };
 
 static int cmdline_commands_size = sizeof(cmdline_commands) / sizeof(cmdline_commands[0]);
@@ -292,6 +295,9 @@ static int parse_cmdline(int argc, const char **argv, RASPISTILLYUV_STATE *state
             i++;
          break;
 
+      case CommandUseRGB: // display lots of data during run
+         state->useRGB = 1;
+         break;
 
       default:
       {
@@ -551,8 +557,16 @@ static MMAL_STATUS_T create_camera_component(RASPISTILLYUV_STATE *state)
    format = still_port->format;
 
    // Set our stills format on the stills  port
-   format->encoding = MMAL_ENCODING_I420;
-   format->encoding_variant = MMAL_ENCODING_I420;
+   if (state->useRGB)
+   {
+      format->encoding = MMAL_ENCODING_BGR24;
+      format->encoding_variant = MMAL_ENCODING_BGR24;
+   }
+   else
+   {
+      format->encoding = MMAL_ENCODING_I420;
+      format->encoding_variant = MMAL_ENCODING_I420;
+   }
    format->es->video.width = state->width;
    format->es->video.height = state->height;
    format->es->video.crop.x = 0;