Merge commit 'e8da8075'

* commit 'e8da8075':
  cmdutils: only use libavresample when it is enabled
  libschroedinger: cosmetics: rename variable avccontext to avctx
  vorbisenc: cosmetics: rename variable avccontext to avctx

Conflicts:
	cmdutils.c
	libavcodec/libschroedinger.c
	libavcodec/libschroedingerenc.c
	libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

cmdutils.c

@@ -474,7 +474,9 @@ int opt_default(void *optctx, const char *opt, const char *arg)
     char opt_stripped[128];
     const char *p;
     const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class();
-    const av_unused AVClass *rc_class;
+#if CONFIG_AVRESAMPLE
+    const AVClass *rc = avresample_get_class();
+#endif
     const AVClass *sc, *swr_class;
 
     if (!strcmp(opt, "debug") || !strcmp(opt, "fdebug"))
@@ -527,8 +529,7 @@ int opt_default(void *optctx, const char *opt, const char *arg)
     }
 #endif
 #if CONFIG_AVRESAMPLE
-    rc_class = avresample_get_class();
-    if ((o=av_opt_find(&rc_class, opt, NULL, 0,
+    if ((o=av_opt_find(&rc, opt, NULL, 0,
                        AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) {
         av_dict_set(&resample_opts, opt, arg, FLAGS);
         consumed = 1;

libavcodec/libschroedinger.c

@@ -46,7 +46,7 @@ static const SchroVideoFormatInfo ff_schro_video_format_info[] = {
     { 4096, 2160, 24,    1   },
 };
 
-static unsigned int get_video_format_idx(AVCodecContext *avccontext)
+static unsigned int get_video_format_idx(AVCodecContext *avctx)
 {
     unsigned int ret_idx = 0;
     unsigned int idx;
@@ -55,11 +55,11 @@ static unsigned int get_video_format_idx(AVCodecContext *avccontext)
 
     for (idx = 1; idx < num_formats; ++idx) {
         const SchroVideoFormatInfo *vf = &ff_schro_video_format_info[idx];
-        if (avccontext->width  == vf->width &&
-            avccontext->height == vf->height) {
+        if (avctx->width  == vf->width &&
+            avctx->height == vf->height) {
             ret_idx = idx;
-            if (avccontext->time_base.den == vf->frame_rate_num &&
-                avccontext->time_base.num == vf->frame_rate_denom)
+            if (avctx->time_base.den == vf->frame_rate_num &&
+                avctx->time_base.num == vf->frame_rate_denom)
                 return idx;
         }
     }
@@ -136,12 +136,12 @@ static const SchroVideoFormatEnum ff_schro_video_formats[]={
     SCHRO_VIDEO_FORMAT_DC4K_24    ,
 };
 
-SchroVideoFormatEnum ff_get_schro_video_format_preset(AVCodecContext *avccontext)
+SchroVideoFormatEnum ff_get_schro_video_format_preset(AVCodecContext *avctx)
 {
     unsigned int num_formats = sizeof(ff_schro_video_formats) /
                                sizeof(ff_schro_video_formats[0]);
 
-    unsigned int idx = get_video_format_idx(avccontext);
+    unsigned int idx = get_video_format_idx(avctx);
 
     return (idx < num_formats) ? ff_schro_video_formats[idx] :
                                  SCHRO_VIDEO_FORMAT_CUSTOM;
@@ -175,7 +175,7 @@ static void free_schro_frame(SchroFrame *frame, void *priv)
     av_freep(&p_pic);
 }
 
-SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext,
+SchroFrame *ff_create_schro_frame(AVCodecContext *avctx,
                                   SchroFrameFormat schro_frame_fmt)
 {
     AVPicture *p_pic;
@@ -184,13 +184,13 @@ SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext,
     int y_height, uv_height;
     int i;
 
-    y_width   = avccontext->width;
-    y_height  = avccontext->height;
+    y_width   = avctx->width;
+    y_height  = avctx->height;
     uv_width  = y_width  >> (SCHRO_FRAME_FORMAT_H_SHIFT(schro_frame_fmt));
     uv_height = y_height >> (SCHRO_FRAME_FORMAT_V_SHIFT(schro_frame_fmt));
 
     p_pic = av_mallocz(sizeof(AVPicture));
-    if (!p_pic || avpicture_alloc(p_pic, avccontext->pix_fmt, y_width, y_height) < 0) {
+    if (!p_pic || avpicture_alloc(p_pic, avctx->pix_fmt, y_width, y_height) < 0) {
         av_free(p_pic);
         return NULL;
     }

libavcodec/libschroedinger.h

@@ -114,7 +114,7 @@ static const struct {
 * Returns the video format preset matching the input video dimensions and
 * time base.
 */
-SchroVideoFormatEnum ff_get_schro_video_format_preset (AVCodecContext *avccontext);
+SchroVideoFormatEnum ff_get_schro_video_format_preset (AVCodecContext *avctx);
 
 /**
 * Sets the Schroedinger frame format corresponding to the Schro chroma format
@@ -127,7 +127,7 @@ int ff_get_schro_frame_format(SchroChromaFormat schro_chroma_fmt,
 * Create a Schro frame based on the dimensions and frame format
 * passed. Returns a pointer to a frame on success, NULL on failure.
 */
-SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext,
+SchroFrame *ff_create_schro_frame(AVCodecContext *avctx,
                                   SchroFrameFormat schro_frame_fmt);
 
 #endif /* AVCODEC_LIBSCHROEDINGER_H */

libavcodec/libschroedingerdec.c

@@ -147,14 +147,14 @@ static enum AVPixelFormat get_chroma_format(SchroChromaFormat schro_pix_fmt)
     return AV_PIX_FMT_NONE;
 }
 
-static av_cold int libschroedinger_decode_init(AVCodecContext *avccontext)
+static av_cold int libschroedinger_decode_init(AVCodecContext *avctx)
 {
 
-    SchroDecoderParams *p_schro_params = avccontext->priv_data;
+    SchroDecoderParams *p_schro_params = avctx->priv_data;
     /* First of all, initialize our supporting libraries. */
     schro_init();
 
-    schro_debug_set_level(avccontext->debug);
+    schro_debug_set_level(avctx->debug);
     p_schro_params->decoder = schro_decoder_new();
     schro_decoder_set_skip_ratio(p_schro_params->decoder, 1);
 
@@ -171,38 +171,38 @@ static void libschroedinger_decode_frame_free(void *frame)
     schro_frame_unref(frame);
 }
 
-static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext)
+static void libschroedinger_handle_first_access_unit(AVCodecContext *avctx)
 {
-    SchroDecoderParams *p_schro_params = avccontext->priv_data;
+    SchroDecoderParams *p_schro_params = avctx->priv_data;
     SchroDecoder *decoder = p_schro_params->decoder;
 
     p_schro_params->format = schro_decoder_get_video_format(decoder);
 
     /* Tell FFmpeg about sequence details. */
     if (av_image_check_size(p_schro_params->format->width,
-                            p_schro_params->format->height, 0, avccontext) < 0) {
-        av_log(avccontext, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n",
+                            p_schro_params->format->height, 0, avctx) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n",
                p_schro_params->format->width, p_schro_params->format->height);
-        avccontext->height = avccontext->width = 0;
+        avctx->height = avctx->width = 0;
         return;
     }
-    avccontext->height  = p_schro_params->format->height;
-    avccontext->width   = p_schro_params->format->width;
-    avccontext->pix_fmt = get_chroma_format(p_schro_params->format->chroma_format);
+    avctx->height  = p_schro_params->format->height;
+    avctx->width   = p_schro_params->format->width;
+    avctx->pix_fmt = get_chroma_format(p_schro_params->format->chroma_format);
 
     if (ff_get_schro_frame_format(p_schro_params->format->chroma_format,
                                   &p_schro_params->frame_format) == -1) {
-        av_log(avccontext, AV_LOG_ERROR,
+        av_log(avctx, AV_LOG_ERROR,
                "This codec currently only supports planar YUV 4:2:0, 4:2:2 "
                "and 4:4:4 formats.\n");
         return;
     }
 
-    avccontext->time_base.den = p_schro_params->format->frame_rate_numerator;
-    avccontext->time_base.num = p_schro_params->format->frame_rate_denominator;
+    avctx->time_base.den = p_schro_params->format->frame_rate_numerator;
+    avctx->time_base.num = p_schro_params->format->frame_rate_denominator;
 }
 
-static int libschroedinger_decode_frame(AVCodecContext *avccontext,
+static int libschroedinger_decode_frame(AVCodecContext *avctx,
                                         void *data, int *got_frame,
                                         AVPacket *avpkt)
 {
@@ -211,7 +211,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext,
     int64_t pts  = avpkt->pts;
     SchroTag *tag;
 
-    SchroDecoderParams *p_schro_params = avccontext->priv_data;
+    SchroDecoderParams *p_schro_params = avctx->priv_data;
     SchroDecoder *decoder = p_schro_params->decoder;
     SchroBuffer *enc_buf;
     SchroFrame* frame;
@@ -237,17 +237,17 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext,
             /* Set Schrotag with the pts to be recovered after decoding*/
             enc_buf->tag = schro_tag_new(av_malloc(sizeof(int64_t)), av_free);
             if (!enc_buf->tag->value) {
-                av_log(avccontext, AV_LOG_ERROR, "Unable to allocate SchroTag\n");
+                av_log(avctx, AV_LOG_ERROR, "Unable to allocate SchroTag\n");
                 return AVERROR(ENOMEM);
             }
             AV_WN(64, enc_buf->tag->value, pts);
             /* Push buffer into decoder. */
             if (SCHRO_PARSE_CODE_IS_PICTURE(enc_buf->data[4]) &&
                 SCHRO_PARSE_CODE_NUM_REFS(enc_buf->data[4]) > 0)
-                avccontext->has_b_frames = 1;
+                avctx->has_b_frames = 1;
             state = schro_decoder_push(decoder, enc_buf);
             if (state == SCHRO_DECODER_FIRST_ACCESS_UNIT)
-                libschroedinger_handle_first_access_unit(avccontext);
+                libschroedinger_handle_first_access_unit(avctx);
             go = 1;
         } else
             outer = 0;
@@ -257,7 +257,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext,
             state = schro_decoder_wait(decoder);
             switch (state) {
             case SCHRO_DECODER_FIRST_ACCESS_UNIT:
-                libschroedinger_handle_first_access_unit(avccontext);
+                libschroedinger_handle_first_access_unit(avctx);
                 break;
 
             case SCHRO_DECODER_NEED_BITS:
@@ -267,7 +267,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext,
 
             case SCHRO_DECODER_NEED_FRAME:
                 /* Decoder needs a frame - create one and push it in. */
-                frame = ff_create_schro_frame(avccontext,
+                frame = ff_create_schro_frame(avctx,
                                               p_schro_params->frame_format);
                 schro_decoder_add_output_picture(decoder, frame);
                 break;
@@ -281,7 +281,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext,
                     /* Add relation between schroframe and pts. */
                     framewithpts = av_malloc(sizeof(LibSchroFrameContext));
                     if (!framewithpts) {
-                        av_log(avccontext, AV_LOG_ERROR, "Unable to allocate FrameWithPts\n");
+                        av_log(avctx, AV_LOG_ERROR, "Unable to allocate FrameWithPts\n");
                         return AVERROR(ENOMEM);
                     }
                     framewithpts->frame = frame;
@@ -309,9 +309,9 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext,
 
     if (framewithpts && framewithpts->frame) {
         if (p_schro_params->dec_frame.data[0])
-            avccontext->release_buffer(avccontext, &p_schro_params->dec_frame);
-        if (ff_get_buffer(avccontext, &p_schro_params->dec_frame) < 0) {
-            av_log(avccontext, AV_LOG_ERROR, "Unable to allocate buffer\n");
+            avctx->release_buffer(avctx, &p_schro_params->dec_frame);
+        if (ff_get_buffer(avctx, &p_schro_params->dec_frame) < 0) {
+            av_log(avctx, AV_LOG_ERROR, "Unable to allocate buffer\n");
             return AVERROR(ENOMEM);
         }
 
@@ -350,15 +350,15 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext,
 }
 
 
-static av_cold int libschroedinger_decode_close(AVCodecContext *avccontext)
+static av_cold int libschroedinger_decode_close(AVCodecContext *avctx)
 {
-    SchroDecoderParams *p_schro_params = avccontext->priv_data;
+    SchroDecoderParams *p_schro_params = avctx->priv_data;
     /* Free the decoder. */
     schro_decoder_free(p_schro_params->decoder);
     av_freep(&p_schro_params->format);
 
     if (p_schro_params->dec_frame.data[0])
-        avccontext->release_buffer(avccontext, &p_schro_params->dec_frame);
+        avctx->release_buffer(avctx, &p_schro_params->dec_frame);
 
     /* Free data in the output frame queue. */
     ff_schro_queue_free(&p_schro_params->dec_frame_queue,
@@ -367,11 +367,11 @@ static av_cold int libschroedinger_decode_close(AVCodecContext *avccontext)
     return 0;
 }
 
-static void libschroedinger_flush(AVCodecContext *avccontext)
+static void libschroedinger_flush(AVCodecContext *avctx)
 {
     /* Got a seek request. Free the decoded frames queue and then reset
      * the decoder */
-    SchroDecoderParams *p_schro_params = avccontext->priv_data;
+    SchroDecoderParams *p_schro_params = avctx->priv_data;
 
     /* Free data in the output frame queue. */
     ff_schro_queue_free(&p_schro_params->dec_frame_queue,

libavcodec/vorbisenc.c

@@ -236,15 +236,15 @@ static int ready_residue(vorbis_enc_residue *rc, vorbis_enc_context *venc)
 }
 
 static int create_vorbis_context(vorbis_enc_context *venc,
-                                 AVCodecContext *avccontext)
+                                 AVCodecContext *avctx)
 {
     vorbis_enc_floor   *fc;
     vorbis_enc_residue *rc;
     vorbis_enc_mapping *mc;
     int i, book, ret;
 
-    venc->channels    = avccontext->channels;
-    venc->sample_rate = avccontext->sample_rate;
+    venc->channels    = avctx->channels;
+    venc->sample_rate = avctx->sample_rate;
     venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11;
 
     venc->ncodebooks = FF_ARRAY_ELEMS(cvectors);
@@ -340,7 +340,7 @@ static int create_vorbis_context(vorbis_enc_context *venc,
         };
         fc->list[i].x = a[i - 2];
     }
-    if (ff_vorbis_ready_floor1_list(avccontext, fc->list, fc->values))
+    if (ff_vorbis_ready_floor1_list(avctx, fc->list, fc->values))
         return AVERROR_BUG;
 
     venc->nresidues = 1;
@@ -1014,10 +1014,10 @@ static int apply_window_and_mdct(vorbis_enc_context *venc,
     return 1;
 }
 
-static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt,
+static int vorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
                                const AVFrame *frame, int *got_packet_ptr)
 {
-    vorbis_enc_context *venc = avccontext->priv_data;
+    vorbis_enc_context *venc = avctx->priv_data;
     float **audio = frame ? (float **)frame->extended_data : NULL;
     int samples = frame ? frame->nb_samples : 0;
     vorbis_enc_mode *mode;
@@ -1029,13 +1029,13 @@ static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt,
         return 0;
     samples = 1 << (venc->log2_blocksize[0] - 1);
 
-    if ((ret = ff_alloc_packet2(avccontext, avpkt, 8192)))
+    if ((ret = ff_alloc_packet2(avctx, avpkt, 8192)))
         return ret;
 
     init_put_bits(&pb, avpkt->data, avpkt->size);
 
     if (pb.size_in_bits - put_bits_count(&pb) < 1 + ilog(venc->nmodes - 1)) {
-        av_log(avccontext, AV_LOG_ERROR, "output buffer is too small\n");
+        av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n");
         return AVERROR(EINVAL);
     }
 
@@ -1055,7 +1055,7 @@ static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt,
         uint16_t posts[MAX_FLOOR_VALUES];
         floor_fit(venc, fc, &venc->coeffs[i * samples], posts, samples);
         if (floor_encode(venc, fc, &pb, posts, &venc->floor[i * samples], samples)) {
-            av_log(avccontext, AV_LOG_ERROR, "output buffer is too small\n");
+            av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n");
             return AVERROR(EINVAL);
         }
     }
@@ -1079,17 +1079,17 @@ static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt,
 
     if (residue_encode(venc, &venc->residues[mapping->residue[mapping->mux[0]]],
                        &pb, venc->coeffs, samples, venc->channels)) {
-        av_log(avccontext, AV_LOG_ERROR, "output buffer is too small\n");
+        av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n");
         return AVERROR(EINVAL);
     }
 
     flush_put_bits(&pb);
     avpkt->size = put_bits_count(&pb) >> 3;
 
-    avpkt->duration = ff_samples_to_time_base(avccontext, avccontext->frame_size);
+    avpkt->duration = ff_samples_to_time_base(avctx, avctx->frame_size);
     if (frame) {
         if (frame->pts != AV_NOPTS_VALUE)
-            avpkt->pts = ff_samples_to_time_base(avccontext, frame->pts);
+            avpkt->pts = ff_samples_to_time_base(avctx, frame->pts);
     } else
         avpkt->pts = venc->next_pts;
     if (avpkt->pts != AV_NOPTS_VALUE)
@@ -1100,9 +1100,9 @@ static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt,
 }
 
 
-static av_cold int vorbis_encode_close(AVCodecContext *avccontext)
+static av_cold int vorbis_encode_close(AVCodecContext *avctx)
 {
-    vorbis_enc_context *venc = avccontext->priv_data;
+    vorbis_enc_context *venc = avctx->priv_data;
     int i;
 
     if (venc->codebooks)
@@ -1155,42 +1155,42 @@ static av_cold int vorbis_encode_close(AVCodecContext *avccontext)
     ff_mdct_end(&venc->mdct[1]);
 
 #if FF_API_OLD_ENCODE_AUDIO
-    av_freep(&avccontext->coded_frame);
+    av_freep(&avctx->coded_frame);
 #endif
-    av_freep(&avccontext->extradata);
+    av_freep(&avctx->extradata);
 
     return 0 ;
 }
 
-static av_cold int vorbis_encode_init(AVCodecContext *avccontext)
+static av_cold int vorbis_encode_init(AVCodecContext *avctx)
 {
-    vorbis_enc_context *venc = avccontext->priv_data;
+    vorbis_enc_context *venc = avctx->priv_data;
     int ret;
 
-    if (avccontext->channels != 2) {
-        av_log(avccontext, AV_LOG_ERROR, "Current FFmpeg Vorbis encoder only supports 2 channels.\n");
+    if (avctx->channels != 2) {
+        av_log(avctx, AV_LOG_ERROR, "Current FFmpeg Vorbis encoder only supports 2 channels.\n");
         return -1;
     }
 
-    if ((ret = create_vorbis_context(venc, avccontext)) < 0)
+    if ((ret = create_vorbis_context(venc, avctx)) < 0)
         goto error;
 
-    avccontext->bit_rate = 0;
-    if (avccontext->flags & CODEC_FLAG_QSCALE)
-        venc->quality = avccontext->global_quality / (float)FF_QP2LAMBDA;
+    avctx->bit_rate = 0;
+    if (avctx->flags & CODEC_FLAG_QSCALE)
+        venc->quality = avctx->global_quality / (float)FF_QP2LAMBDA;
     else
         venc->quality = 8;
     venc->quality *= venc->quality;
 
-    if ((ret = put_main_header(venc, (uint8_t**)&avccontext->extradata)) < 0)
+    if ((ret = put_main_header(venc, (uint8_t**)&avctx->extradata)) < 0)
         goto error;
-    avccontext->extradata_size = ret;
+    avctx->extradata_size = ret;
 
-    avccontext->frame_size = 1 << (venc->log2_blocksize[0] - 1);
+    avctx->frame_size = 1 << (venc->log2_blocksize[0] - 1);
 
 #if FF_API_OLD_ENCODE_AUDIO
-    avccontext->coded_frame = avcodec_alloc_frame();
-    if (!avccontext->coded_frame) {
+    avctx->coded_frame = avcodec_alloc_frame();
+    if (!avctx->coded_frame) {
         ret = AVERROR(ENOMEM);
         goto error;
     }
@@ -1198,7 +1198,7 @@ static av_cold int vorbis_encode_init(AVCodecContext *avccontext)
 
     return 0;
 error:
-    vorbis_encode_close(avccontext);
+    vorbis_encode_close(avctx);
     return ret;
 }