Remove useless line.
[ffmpeg.git] / libavcodec / libschroedingerenc.c
index 965096a..44d4dcd 100644 (file)
@@ -40,8 +40,7 @@
 
 
 /** libschroedinger encoder private data */
-typedef struct FfmpegSchroEncoderParams
-{
+typedef struct FfmpegSchroEncoderParams {
     /** Schroedinger video format */
     SchroVideoFormat *format;
 
@@ -86,16 +85,16 @@ static int SetSchroChromaFormat(AVCodecContext *avccontext)
 
     for (idx = 0; idx < num_formats; ++idx) {
         if (ffmpeg_schro_pixel_format_map[idx].ff_pix_fmt ==
-                                                       avccontext->pix_fmt) {
+            avccontext->pix_fmt) {
             p_schro_params->format->chroma_format =
                             ffmpeg_schro_pixel_format_map[idx].schro_pix_fmt;
             return 0;
         }
     }
 
-    av_log (avccontext, AV_LOG_ERROR,
-            "This codec currently only supports planar YUV 4:2:0, 4:2:2"
-            " and 4:4:4 formats.\n");
+    av_log(avccontext, AV_LOG_ERROR,
+           "This codec currently only supports planar YUV 4:2:0, 4:2:2"
+           " and 4:4:4 formats.\n");
 
     return -1;
 }
@@ -121,8 +120,8 @@ static int libschroedinger_encode_init(AVCodecContext *avccontext)
     preset = ff_get_schro_video_format_preset(avccontext);
     p_schro_params->format =
                     schro_encoder_get_video_format(p_schro_params->encoder);
-    schro_video_format_set_std_video_format (p_schro_params->format, preset);
-    p_schro_params->format->width = avccontext->width;
+    schro_video_format_set_std_video_format(p_schro_params->format, preset);
+    p_schro_params->format->width  = avccontext->width;
     p_schro_params->format->height = avccontext->height;
 
     if (SetSchroChromaFormat(avccontext) == -1)
@@ -130,9 +129,9 @@ static int libschroedinger_encode_init(AVCodecContext *avccontext)
 
     if (ff_get_schro_frame_format(p_schro_params->format->chroma_format,
                                   &p_schro_params->frame_format) == -1) {
-        av_log (avccontext, AV_LOG_ERROR,
-                "This codec currently supports only planar YUV 4:2:0, 4:2:2"
-                " and 4:4:4 formats.\n");
+        av_log(avccontext, AV_LOG_ERROR,
+               "This codec currently supports only planar YUV 4:2:0, 4:2:2"
+               " and 4:4:4 formats.\n");
         return -1;
     }
 
@@ -145,61 +144,57 @@ static int libschroedinger_encode_init(AVCodecContext *avccontext)
 
     avccontext->coded_frame = &p_schro_params->picture;
 
-    if (avccontext->gop_size == 0){
-        schro_encoder_setting_set_double (p_schro_params->encoder,
-                                          "gop_structure",
-                                          SCHRO_ENCODER_GOP_INTRA_ONLY);
+    if (!avccontext->gop_size) {
+        schro_encoder_setting_set_double(p_schro_params->encoder,
+                                         "gop_structure",
+                                         SCHRO_ENCODER_GOP_INTRA_ONLY);
 
-        if (avccontext->coder_type == FF_CODER_TYPE_VLC) {
-            schro_encoder_setting_set_double (p_schro_params->encoder,
-                                              "enable_noarith", 1);
-        }
-    }
-    else {
-        schro_encoder_setting_set_double (p_schro_params->encoder,
-                                          "gop_structure",
-                                          SCHRO_ENCODER_GOP_BIREF);
+        if (avccontext->coder_type == FF_CODER_TYPE_VLC)
+            schro_encoder_setting_set_double(p_schro_params->encoder,
+                                             "enable_noarith", 1);
+    } else {
+        schro_encoder_setting_set_double(p_schro_params->encoder,
+                                         "gop_structure",
+                                         SCHRO_ENCODER_GOP_BIREF);
         avccontext->has_b_frames = 1;
     }
 
     /* FIXME - Need to handle SCHRO_ENCODER_RATE_CONTROL_LOW_DELAY. */
     if (avccontext->flags & CODEC_FLAG_QSCALE) {
-        if (avccontext->global_quality == 0) {
+        if (!avccontext->global_quality) {
             /* lossless coding */
-            schro_encoder_setting_set_double (p_schro_params->encoder,
-                                          "rate_control",
-                                          SCHRO_ENCODER_RATE_CONTROL_LOSSLESS);
+            schro_encoder_setting_set_double(p_schro_params->encoder,
+                                             "rate_control",
+                                             SCHRO_ENCODER_RATE_CONTROL_LOSSLESS);
         } else {
             int noise_threshold;
-            schro_encoder_setting_set_double (p_schro_params->encoder,
-                          "rate_control",
-                          SCHRO_ENCODER_RATE_CONTROL_CONSTANT_NOISE_THRESHOLD);
+            schro_encoder_setting_set_double(p_schro_params->encoder,
+                                             "rate_control",
+                                             SCHRO_ENCODER_RATE_CONTROL_CONSTANT_NOISE_THRESHOLD);
 
-            noise_threshold = avccontext->global_quality/FF_QP2LAMBDA;
+            noise_threshold = avccontext->global_quality / FF_QP2LAMBDA;
             if (noise_threshold > 100)
                 noise_threshold = 100;
-            schro_encoder_setting_set_double (p_schro_params->encoder,
-                                              "noise_threshold",
-                                              noise_threshold);
+            schro_encoder_setting_set_double(p_schro_params->encoder,
+                                             "noise_threshold",
+                                             noise_threshold);
         }
-    }
-    else {
-        schro_encoder_setting_set_double ( p_schro_params->encoder,
-                               "rate_control",
-                               SCHRO_ENCODER_RATE_CONTROL_CONSTANT_BITRATE);
+    } else {
+        schro_encoder_setting_set_double(p_schro_params->encoder,
+                                         "rate_control",
+                                         SCHRO_ENCODER_RATE_CONTROL_CONSTANT_BITRATE);
 
-        schro_encoder_setting_set_double (p_schro_params->encoder,
-                                          "bitrate",
-                                          avccontext->bit_rate);
+        schro_encoder_setting_set_double(p_schro_params->encoder,
+                                         "bitrate",
+                                         avccontext->bit_rate);
 
     }
 
-    if (avccontext->flags & CODEC_FLAG_INTERLACED_ME) {
+    if (avccontext->flags & CODEC_FLAG_INTERLACED_ME)
         /* All material can be coded as interlaced or progressive
            irrespective of the type of source material. */
-        schro_encoder_setting_set_double (p_schro_params->encoder,
-                                            "interlaced_coding", 1);
-    }
+        schro_encoder_setting_set_double(p_schro_params->encoder,
+                                         "interlaced_coding", 1);
 
     /* FIXME: Signal range hardcoded to 8-bit data until both libschroedinger
      * and libdirac support other bit-depth data. */
@@ -211,32 +206,30 @@ static int libschroedinger_encode_init(AVCodecContext *avccontext)
                                    p_schro_params->format);
 
     /* Set the debug level. */
-    schro_debug_set_level (avccontext->debug);
+    schro_debug_set_level(avccontext->debug);
 
-    schro_encoder_start (p_schro_params->encoder);
+    schro_encoder_start(p_schro_params->encoder);
 
     /* Initialize the encoded frame queue. */
-    ff_dirac_schro_queue_init (&p_schro_params->enc_frame_queue);
-    return 0 ;
+    ff_dirac_schro_queue_init(&p_schro_params->enc_frame_queue);
+    return 0;
 }
 
-static SchroFrame *libschroedinger_frame_from_data (AVCodecContext *avccontext,
-                                                    void *in_data)
+static SchroFrame *libschroedinger_frame_from_data(AVCodecContext *avccontext,
+                                                   void *in_data)
 {
     FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data;
     SchroFrame *in_frame;
     /* Input line size may differ from what the codec supports. Especially
      * when transcoding from one format to another. So use avpicture_layout
      * to copy the frame. */
-    in_frame = schro_frame_new_and_alloc (NULL,
-                                          p_schro_params->frame_format,
-                                          p_schro_params->format->width,
-                                          p_schro_params->format->height);
+    in_frame = ff_create_schro_frame(avccontext, p_schro_params->frame_format);
 
-    avpicture_layout ((AVPicture *)in_data, avccontext->pix_fmt,
-                      avccontext->width, avccontext->height,
-                      in_frame->components[0].data,
-                      p_schro_params->frame_size);
+    if (in_frame)
+        avpicture_layout((AVPicture *)in_data, avccontext->pix_fmt,
+                          avccontext->width, avccontext->height,
+                          in_frame->components[0].data,
+                          p_schro_params->frame_size);
 
     return in_frame;
 }
@@ -245,7 +238,7 @@ static void SchroedingerFreeFrame(void *data)
 {
     FfmpegDiracSchroEncodedFrame *enc_frame = data;
 
-    av_freep (&(enc_frame->p_encbuf));
+    av_freep(&(enc_frame->p_encbuf));
     av_free(enc_frame);
 }
 
@@ -263,7 +256,7 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext,
     int parse_code;
     int last_frame_in_sequence = 0;
 
-    if(data == NULL) {
+    if (!data) {
         /* Push end of sequence if not already signalled. */
         if (!p_schro_params->eos_signalled) {
             schro_encoder_end_of_stream(encoder);
@@ -271,8 +264,8 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext,
         }
     } else {
         /* Allocate frame data to schro input buffer. */
-        SchroFrame *in_frame = libschroedinger_frame_from_data (avccontext,
-                                                                data);
+        SchroFrame *in_frame = libschroedinger_frame_from_data(avccontext,
+                                                               data);
         /* Load next frame. */
         schro_encoder_push_frame(encoder, in_frame);
     }
@@ -282,28 +275,24 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext,
 
     /* Now check to see if we have any output from the encoder. */
     while (go) {
-        SchroStateEnum  state;
+        SchroStateEnum state;
         state = schro_encoder_wait(encoder);
-        switch (state)
-        {
+        switch (state) {
         case SCHRO_STATE_HAVE_BUFFER:
         case SCHRO_STATE_END_OF_STREAM:
-            enc_buf = schro_encoder_pull (encoder,
-                                          &presentation_frame);
-            assert (enc_buf->length > 0);
-            assert (enc_buf->length <= buf_size);
+            enc_buf = schro_encoder_pull(encoder, &presentation_frame);
+            assert(enc_buf->length > 0);
+            assert(enc_buf->length <= buf_size);
             parse_code = enc_buf->data[4];
 
             /* All non-frame data is prepended to actual frame data to
              * be able to set the pts correctly. So we don't write data
              * to the frame output queue until we actually have a frame
              */
-             p_schro_params->enc_buf = av_realloc (
-                                p_schro_params->enc_buf,
-                                p_schro_params->enc_buf_size + enc_buf->length
-                                );
+            p_schro_params->enc_buf = av_realloc(p_schro_params->enc_buf,
+                                                 p_schro_params->enc_buf_size + enc_buf->length);
 
-            memcpy(p_schro_params->enc_buf+p_schro_params->enc_buf_size,
+            memcpy(p_schro_params->enc_buf + p_schro_params->enc_buf_size,
                    enc_buf->data, enc_buf->length);
             p_schro_params->enc_buf_size += enc_buf->length;
 
@@ -314,7 +303,7 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext,
             }
 
             if (!SCHRO_PARSE_CODE_IS_PICTURE(parse_code)) {
-                schro_buffer_unref (enc_buf);
+                schro_buffer_unref(enc_buf);
                 break;
             }
 
@@ -324,9 +313,8 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext,
             p_frame_output->size     = p_schro_params->enc_buf_size;
             p_frame_output->p_encbuf = p_schro_params->enc_buf;
             if (SCHRO_PARSE_CODE_IS_INTRA(parse_code) &&
-                SCHRO_PARSE_CODE_IS_REFERENCE(parse_code)) {
+                SCHRO_PARSE_CODE_IS_REFERENCE(parse_code))
                 p_frame_output->key_frame = 1;
-            }
 
             /* Parse the coded frame number from the bitstream. Bytes 14
              * through 17 represesent the frame number. */
@@ -335,12 +323,12 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext,
                                             (enc_buf->data[15] <<  8) +
                                              enc_buf->data[16];
 
-            ff_dirac_schro_queue_push_back (&p_schro_params->enc_frame_queue,
-                                            p_frame_output);
+            ff_dirac_schro_queue_push_back(&p_schro_params->enc_frame_queue,
+                                           p_frame_output);
             p_schro_params->enc_buf_size = 0;
             p_schro_params->enc_buf      = NULL;
 
-            schro_buffer_unref (enc_buf);
+            schro_buffer_unref(enc_buf);
 
             break;
 
@@ -363,10 +351,9 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext,
         p_schro_params->eos_pulled)
         last_frame_in_sequence = 1;
 
-    p_frame_output =
-               ff_dirac_schro_queue_pop (&p_schro_params->enc_frame_queue);
+    p_frame_output = ff_dirac_schro_queue_pop(&p_schro_params->enc_frame_queue);
 
-    if (p_frame_output == NULL)
+    if (!p_frame_output)
         return 0;
 
     memcpy(frame, p_frame_output->p_encbuf, p_frame_output->size);
@@ -379,17 +366,16 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext,
 
     /* Append the end of sequence information to the last frame in the
      * sequence. */
-    if (last_frame_in_sequence && p_schro_params->enc_buf_size > 0)
-    {
-        memcpy (frame + enc_size, p_schro_params->enc_buf,
-                p_schro_params->enc_buf_size);
+    if (last_frame_in_sequence && p_schro_params->enc_buf_size > 0) {
+        memcpy(frame + enc_size, p_schro_params->enc_buf,
+               p_schro_params->enc_buf_size);
         enc_size += p_schro_params->enc_buf_size;
-        av_freep (&p_schro_params->enc_buf);
+        av_freep(&p_schro_params->enc_buf);
         p_schro_params->enc_buf_size = 0;
     }
 
     /* free frame */
-    SchroedingerFreeFrame (p_frame_output);
+    SchroedingerFreeFrame(p_frame_output);
 
     return enc_size;
 }
@@ -400,12 +386,12 @@ static int libschroedinger_encode_close(AVCodecContext *avccontext)
 
     FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data;
 
-     /* Close the encoder. */
+    /* Close the encoder. */
     schro_encoder_free(p_schro_params->encoder);
 
     /* Free data in the output frame queue. */
-    ff_dirac_schro_queue_free (&p_schro_params->enc_frame_queue,
-                               SchroedingerFreeFrame);
+    ff_dirac_schro_queue_free(&p_schro_params->enc_frame_queue,
+                              SchroedingerFreeFrame);
 
 
     /* Free the encoder buffer. */
@@ -415,7 +401,7 @@ static int libschroedinger_encode_close(AVCodecContext *avccontext)
     /* Free the video format structure. */
     av_freep(&p_schro_params->format);
 
-    return 0 ;
+    return 0;
 }
 
 
@@ -427,7 +413,7 @@ AVCodec libschroedinger_encoder = {
     libschroedinger_encode_init,
     libschroedinger_encode_frame,
     libschroedinger_encode_close,
-   .capabilities= CODEC_CAP_DELAY,
-   .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE},
-   .long_name= NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
+   .capabilities = CODEC_CAP_DELAY,
+   .pix_fmts     = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE},
+   .long_name    = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
 };