+@@ -51,10 +50,10 @@ static int video_input_init(struct video_input_ctx *input_ctx,
+ {
+ AVInputFormat *input_format = NULL;
+ AVFormatContext *input_format_ctx;
+- AVCodecParameters *input_codec_params;
+ AVCodecContext *input_codec_ctx;
+ AVCodec *input_codec;
+ int video_index;
++ unsigned int i;
+ int ret;
+
+ avdevice_register_all();
+@@ -99,32 +98,34 @@ static int video_input_init(struct video_input_ctx *input_ctx,
+ av_dump_format(input_format_ctx, 0, input_path, 0);
+
+ /* look for the first video_stream */
+- video_index = av_find_best_stream(input_format_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, &input_codec, 0);
+- if (video_index < 0) {
++ video_index = -1;
++ for (i = 0; i < input_format_ctx->nb_streams; i++)
++ if (input_format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
++ video_index = i;
++ break;
++ }
++ if (video_index == -1) {
+ fprintf(stderr, "cannot find any video streams\n");
+ ret = -EINVAL;
+ goto cleanup;
+ }
+
+- input_codec_ctx = avcodec_alloc_context3(input_codec);
+- if (input_codec_ctx == NULL) {
+- fprintf(stderr, "failed to allocate the input codec context\n");
+- ret = -ENOMEM;
+- goto cleanup;
+- }
++ /* get a pointer to the codec context for the video stream */
++ input_codec_ctx = input_format_ctx->streams[video_index]->codec;
+
+- input_codec_params = input_format_ctx->streams[video_index]->codecpar;
+- ret = avcodec_parameters_to_context(input_codec_ctx, input_codec_params);
+- if (ret < 0) {
+- fprintf(stderr, "cannot copy parameters to input codec context\n");
+- goto cleanup_ctx;
++ /* find the decoder for the video stream */
++ input_codec = avcodec_find_decoder(input_codec_ctx->codec_id);
++ if (input_codec == NULL) {
++ fprintf(stderr, "input_codec is NULL!\n");
++ ret = -EINVAL;
++ goto cleanup;
+ }
+
+ /* open the decoder */
+ ret = avcodec_open2(input_codec_ctx, input_codec, NULL);
+ if (ret < 0) {
+ fprintf(stderr, "cannot open input codec\n");
+- goto cleanup_ctx;
++ goto cleanup;
+ }
+
+ input_ctx->format_ctx = input_format_ctx;
+@@ -134,8 +135,6 @@ static int video_input_init(struct video_input_ctx *input_ctx,
+ ret = 0;
+ goto out;
+
+-cleanup_ctx:
+- avcodec_free_context(&input_codec_ctx);
+ cleanup:
+ avformat_close_input(&input_format_ctx);
+ out:
+@@ -177,7 +176,7 @@ static int video_output_init(struct video_output_ctx *output_ctx,
+ goto out;
+ }
+
+- /* Calculate the new output dimension so the original frame is shown
++ /* Calculate the new output dimension so the original picture is shown
+ * in its entirety */
+ ret = am7xxx_calc_scaled_image_dimensions(dev,
+ upscale,
+@@ -226,7 +225,7 @@ static int video_output_init(struct video_output_ctx *output_ctx,
+ output_codec_ctx->qmin = output_codec_ctx->qmax = ((100 - (quality - 1)) * FF_QUALITY_SCALE) / 100;
+ output_codec_ctx->mb_lmin = output_codec_ctx->qmin * FF_QP2LAMBDA;
+ output_codec_ctx->mb_lmax = output_codec_ctx->qmax * FF_QP2LAMBDA;
+- output_codec_ctx->flags |= AV_CODEC_FLAG_QSCALE;
++ output_codec_ctx->flags |= CODEC_FLAG_QSCALE;
+ output_codec_ctx->global_quality = output_codec_ctx->qmin * FF_QP2LAMBDA;
+
+ /* find the encoder */
+@@ -257,67 +256,6 @@ out:
+ }
+
+
+-/*
+- * Wrap the new avcodec API from FFMpeg 3.1 to minimize the changes in the
+- * user code.
+- *
+- * If the use of the wrappers were to be made conditional, a check like the
+- * following could be used:
+- *
+- * #if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101))
+- *
+- * As derived from the APIchanges document:
+- * https://github.com/FFmpeg/FFmpeg/blob/master/doc/APIchanges
+- *
+- * The wrapper implementation has been taken from:
+- * https://blogs.gentoo.org/lu_zero/2016/03/29/new-avcodec-api/
+- */
+-static int decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *pkt)
+-{
+- int ret;
+-
+- *got_frame = 0;
+-
+- if (pkt) {
+- ret = avcodec_send_packet(avctx, pkt);
+- /*
+- * In particular, we don't expect AVERROR(EAGAIN), because we
+- * read all decoded frames with avcodec_receive_frame() until
+- * done.
+- */
+- if (ret < 0)
+- return ret == AVERROR_EOF ? 0 : ret;
+- }
+-
+- ret = avcodec_receive_frame(avctx, frame);
+- if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF)
+- return ret;
+- if (ret >= 0)
+- *got_frame = 1;
+-
+- return 0;
+-}
+-
+-static int encode(AVCodecContext *avctx, AVPacket *pkt, int *got_packet, AVFrame *frame)
+-{
+- int ret;
+-
+- *got_packet = 0;
+-
+- ret = avcodec_send_frame(avctx, frame);
+- if (ret < 0)
+- return ret;
+-
+- ret = avcodec_receive_packet(avctx, pkt);
+- if (!ret)
+- *got_packet = 1;
+- if (ret == AVERROR(EAGAIN))
+- return 0;
+-
+- return ret;
+-}
+-
+-
+ static int am7xxx_play(const char *input_format_string,
+ AVDictionary **input_options,
+ const char *input_path,
+@@ -330,16 +268,16 @@ static int am7xxx_play(const char *input_format_string,
+ {
+ struct video_input_ctx input_ctx;
+ struct video_output_ctx output_ctx;
+- AVFrame *frame_raw;
+- AVFrame *frame_scaled;
++ AVFrame *picture_raw;
++ AVFrame *picture_scaled;
+ int out_buf_size;
+ uint8_t *out_buf;
+- int out_frame_size;
+- uint8_t *out_frame;
++ int out_picture_size;
++ uint8_t *out_picture;
+ struct SwsContext *sw_scale_ctx;
+ AVPacket in_packet;
+ AVPacket out_packet;
+- int got_frame;
++ int got_picture;
+ int got_packet;
+ int ret;
+
+@@ -356,44 +294,41 @@ static int am7xxx_play(const char *input_format_string,
projects / libam7xxx.git / blobdiff