[Qt][AVIO][WIP] Drop to use deprecated functions for FFMpeg 4.x.This still disabled...

diff --git a/source/src/qt/avio/CMakeLists.txt b/source/src/qt/avio/CMakeLists.txt
index 27c4cfe..08e5e60 100644 (file)
--- a/source/src/qt/avio/CMakeLists.txt
+++ b/source/src/qt/avio/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* qt/avio")
 
-SET(THIS_LIB_VERSION 2.11.0)
+SET(THIS_LIB_VERSION 2.11.1)
 set(s_qt_avio_headers
          movie_saver.h
          movie_loader.h
@@ -36,7 +36,7 @@ add_library(CSPavio SHARED
 )
 
 target_link_libraries(CSPavio PUBLIC
-                  ${LIBAV_LIBRARIES}
+                  PRIVATE ${LIBAV_LIBRARIES}
                   ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPosd.dll.a
 #                 ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPgui.dll.a
                   ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPemu_utils.dll.a

diff --git a/source/src/qt/avio/movie_loader.cpp b/source/src/qt/avio/movie_loader.cpp
index 0ef28ab..b8be642 100644 (file)
--- a/source/src/qt/avio/movie_loader.cpp
+++ b/source/src/qt/avio/movie_loader.cpp
@@ -77,7 +77,6 @@ MOVIE_LOADER::~MOVIE_LOADER()
 #if defined(USE_LIBAV)
 int MOVIE_LOADER::decode_audio(AVCodecContext *dec_ctx, int *got_frame)
 {
-    int  ch;
     int ret = 0;
 #if (LIBAVCODEC_VERSION_MAJOR > 56)
     /* send the packet with the compressed data to the decoder */
@@ -100,9 +99,7 @@ int MOVIE_LOADER::decode_audio(AVCodecContext *dec_ctx, int *got_frame)
 
 int MOVIE_LOADER::decode_video(AVCodecContext *dec_ctx, int *got_frame)
 {
-    int i, ch;
     int ret = 0;
-       int data_size;
 #if (LIBAVCODEC_VERSION_MAJOR > 56)
     /* send the packet with the compressed data to the decoder */
        if(got_frame != NULL) *got_frame = 0;
@@ -180,7 +177,7 @@ int MOVIE_LOADER::decode_packet(int *got_frame, int cached)
                                //video_mutex->unlock();
                        }
                        
-                       char str_buf2[AV_TS_MAX_STRING_SIZE] = {0};
+//                     char str_buf2[AV_TS_MAX_STRING_SIZE] = {0};
 
 
                        video_frame_count++;
@@ -235,7 +232,7 @@ int MOVIE_LOADER::decode_packet(int *got_frame, int cached)
                        
                if (*got_frame) {
                        //size_t unpadded_linesize = frame->nb_samples * av_get_bytes_per_sample((enum AVSampleFormat)frame->format);
-                       char str_buf[AV_TS_MAX_STRING_SIZE] = {0};
+//                     char str_buf[AV_TS_MAX_STRING_SIZE] = {0};
 //                     AVCodecContext *c = avcodec_alloc_context3(NULL);
                        AVCodecContext *c = audio_dec_ctx;
                        if (c == NULL) {
@@ -386,7 +383,7 @@ int MOVIE_LOADER::get_format_from_sample_fmt(const char **fmt,
 
 bool MOVIE_LOADER::open(QString filename)
 {
-    int ret = 0, got_frame;
+    int ret = 0;
        _filename = filename;
        if(_filename.isEmpty()) return false;
        
@@ -398,8 +395,9 @@ bool MOVIE_LOADER::open(QString filename)
        audio_total_samples = 0;
        
     /* register all formats and codecs */
+#if (LIBAVCODEC_VERSION_MAJOR <= 56)
     av_register_all();
-
+#endif
     /* open input file, and allocate format context */
     if (avformat_open_input(&fmt_ctx, _filename.toLocal8Bit().constData(), NULL, NULL) < 0) {
         p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_LOADER, "Could not open source file %s\n", _filename.toLocal8Bit().constData());
@@ -427,7 +425,11 @@ bool MOVIE_LOADER::open(QString filename)
         src_height = video_dec_ctx->height;
         pix_fmt = video_dec_ctx->pix_fmt;
                AVRational rate;
+#if (LIBAVCODEC_VERSION_MAJOR > 56)
+               rate = video_stream->avg_frame_rate;
+#else
                rate = av_stream_get_r_frame_rate(video_stream);
+#endif
                frame_rate = av_q2d(rate);
         if (ret < 0) {
             p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_LOADER, "Could not allocate raw video buffer\n");

diff --git a/source/src/qt/avio/movie_saver.cpp b/source/src/qt/avio/movie_saver.cpp
index d50d8a7..bfe55e8 100644 (file)
--- a/source/src/qt/avio/movie_saver.cpp
+++ b/source/src/qt/avio/movie_saver.cpp
@@ -230,8 +230,6 @@ void MOVIE_SAVER::run()
        int tmp_wait = fps_wait;
        bool need_audio_transcode = false;
        bool need_video_transcode = false;
-       int i;
-       int64_t total_packets_written = 0;
        bool a_f, v_f;
        a_f = v_f = false;
        volatile bool old_recording = false;
@@ -288,16 +286,36 @@ void MOVIE_SAVER::run()
                                need_video_transcode = true;
                        }
                _write_frame:
+                       int result_ts = 0;
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+                       if(audio_st.context != NULL) {
+                               if(video_st.context != NULL) {
+                                       result_ts = av_compare_ts(video_st.next_pts, video_st.context->time_base,
+                                                                                         audio_st.next_pts, audio_st.context->time_base);
+                               } else {
+                                       result_ts = 1; // AUDIO ONLY
+                               }
+                       } else {
+                               if(video_st.context != NULL) {
+                                       result_ts = -1; // VIDEO ONLY
+                               }
+                       }
+#else
+                       result_ts =      av_compare_ts(video_st.next_pts, video_st.st->codec->time_base,
+                                                                          audio_st.next_pts, audio_st.st->codec->time_base);
+#endif
                        if ((n_encode_video == 0) &&
-                               ((n_encode_audio != 0) || av_compare_ts(video_st.next_pts, video_st.st->codec->time_base,
-                                                                                                               audio_st.next_pts, audio_st.st->codec->time_base) <= 0)) {
+                               ((n_encode_audio != 0) ||
+                                (result_ts <= 0))) {
                                n_encode_video = write_video_frame();
+                               ret = n_encode_video;
                                if(n_encode_video < 0) {
                                        p_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_MOVIE_SAVER, "MOVIE/Saver: Something wrong with encoding video.");
                                        goto _final;
                                }
                        } else {
                                n_encode_audio = write_audio_frame();
+                               ret = n_encode_audio;
                                if(n_encode_audio < 0) {
                                        p_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_MOVIE_SAVER, "MOVIE/Saver: Something wrong with encoding audio.");
                                        goto _final;

diff --git a/source/src/qt/avio/movie_saver.h b/source/src/qt/avio/movie_saver.h
index e43f180..6910973 100644 (file)
--- a/source/src/qt/avio/movie_saver.h
+++ b/source/src/qt/avio/movie_saver.h
@@ -70,6 +70,9 @@ typedef struct OutputStream {
 
        struct SwsContext *sws_ctx;
        struct SwrContext *swr_ctx;
+#if (LIBAVCODEC_VERSION_MAJOR > 56)
+       AVCodecContext *context;
+#endif   
 } OutputStream;
 
 class OSD;
@@ -120,10 +123,9 @@ protected:
        AVFormatContext *output_context;
        AVCodec *audio_codec, *video_codec;
        AVDictionary *raw_options_list;
-
+#endif
        OutputStream video_st;
        OutputStream audio_st;
-#endif   
        QString _filename;
        bool bRunThread;
        bool debug_timestamp;

diff --git a/source/src/qt/avio/movie_saver_audio.cpp b/source/src/qt/avio/movie_saver_audio.cpp
index 66dace6..43e5bc8 100644 (file)
--- a/source/src/qt/avio/movie_saver_audio.cpp
+++ b/source/src/qt/avio/movie_saver_audio.cpp
@@ -66,18 +66,24 @@ bool MOVIE_SAVER::open_audio(void)
        AVDictionary *opt_arg = raw_options_list;
        OutputStream *ost = &audio_st;
        AVCodec *codec = audio_codec;
-       AVCodecContext *c;
+       AVCodecContext *c = NULL;
        int nb_samples;
        int ret;
        AVDictionary *opt = NULL;
 
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       c = ost->context;
+#else
        c = ost->st->codec;
-
+#endif
        /* open it */
        av_dict_copy(&opt, opt_arg, 0);
        ret = avcodec_open2(c, codec, &opt);
        av_dict_free(&opt);
        if (ret < 0) {
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+               avcodec_free_context(&(ost->context));
+#endif
                p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Could not open audio codec: %s\n", err2str(ret).toLocal8Bit().constData());
                return false;
        }
@@ -86,17 +92,18 @@ bool MOVIE_SAVER::open_audio(void)
                nb_samples = 10000;
        else
                nb_samples = c->frame_size;
-
        ost->frame       = (AVFrame *)alloc_audio_frame((uint64_t)c->sample_fmt, c->channel_layout,
                                                                           c->sample_rate, nb_samples);
        ost->tmp_frame = (AVFrame *)alloc_audio_frame((uint64_t)AV_SAMPLE_FMT_S16, c->channel_layout,
                                                                           c->sample_rate, nb_samples);
 
        /* create resampler context */
-#if 1
        /* set options */
        ost->swr_ctx = swr_alloc();
        if (!ost->swr_ctx) {
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+               avcodec_free_context(&(ost->context));
+#endif
                p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Could not allocate resampler context\n");
                return false;
        }
@@ -107,18 +114,11 @@ bool MOVIE_SAVER::open_audio(void)
        av_opt_set_int     (ost->swr_ctx, "out_sample_rate",    c->sample_rate, 0);
        av_opt_set_sample_fmt(ost->swr_ctx, "out_sample_fmt",    c->sample_fmt,  0);
        
-#else
-       ost->swr_ctx = swr_alloc_set_opts(NULL,
-                                                                         AV_CH_LAYOUT_STEREO, c->sample_fmt, c->sample_rate,
-                                                                         AV_CH_LAYOUT_STEREO, AV_SAMPLE_FMT_S16, audio_sample_rate,
-                                                                         0, NULL);
-       if (ost->swr_ctx == NULL) {
-               p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Failed to initialize the resampling context\n");
-               return false;
-       }
-#endif 
        /* initialize the resampling context */
        if ((ret = swr_init(ost->swr_ctx)) < 0) {
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+               avcodec_free_context(&(ost->context));
+#endif
                p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Failed to initialize the resampling context\n");
                return false;
        }
@@ -135,8 +135,7 @@ bool MOVIE_SAVER::open_audio(void)
 void *MOVIE_SAVER::get_audio_frame()
 {
 #if defined(USE_LIBAV)
-       OutputStream *ost = &audio_st;
-       AVFrame *frame = ost->tmp_frame;
+       AVFrame *frame = audio_st.tmp_frame;
        int j, i;
        int16_t *q = (int16_t*)frame->data[0];
        int offset = 0;
@@ -153,7 +152,13 @@ void *MOVIE_SAVER::get_audio_frame()
                        audio_remain = audio_size;
                        audio_offset = 0;
                }
-               for (i = 0; i < ost->st->codec->channels; i++) {
+               int chs;
+       #if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+               chs = audio_st.context->channels;
+       #else
+               chs = audio_st.st->codec->channels;
+       #endif
+               for (i = 0; i < chs; i++) {
                        q[offset++] = audio_frame_buf[audio_offset++];
                        audio_remain -= sizeof(int16_t);
                        if(audio_remain <= 0) {
@@ -167,7 +172,11 @@ void *MOVIE_SAVER::get_audio_frame()
                        //}
                }
        }
-       frame->pts = av_rescale_rnd(ost->next_pts, audio_st.st->codec->sample_rate, audio_sample_rate, AV_ROUND_UP);
+       #if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       frame->pts = av_rescale_rnd(audio_st.next_pts, audio_st.context->sample_rate, audio_sample_rate, AV_ROUND_UP);
+       #else
+       frame->pts = av_rescale_rnd(audio_st.next_pts, audio_st.st->codec->sample_rate, audio_sample_rate, AV_ROUND_UP);
+       #endif
        //frame->pts = ost->next_pts;
        //ost->next_pts += frame->nb_samples;
 
@@ -195,9 +204,12 @@ int MOVIE_SAVER::write_audio_frame()
        int got_packet;
        int dst_nb_samples;
 
-       av_init_packet(&pkt);
+       #if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       c = ost->context;
+       #else
        c = ost->st->codec;
-
+       #endif
+       av_init_packet(&pkt);
        frame_src = (AVFrame *)get_audio_frame();
        //if(req_close) return 1;
        if (frame_src == NULL) return 0;
@@ -238,7 +250,37 @@ int MOVIE_SAVER::write_audio_frame()
                ost->next_pts += dst_nb_samples;
                totalAudioFrame++;
        }
-
+       #if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       got_packet = 0;
+       {
+               ret = avcodec_send_frame(c, frame_dst);
+               if(ret < 0) {
+                       if(ret == AVERROR_EOF) {
+                               return 0;
+                       }
+                       return ((ret == AVERROR(EAGAIN)) ? 0 : -1);
+               }
+               while (ret >= 0) {
+                       ret = avcodec_receive_packet(c, &pkt);
+                       if(ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
+                               return (got_packet || frame_dst) ? 0 : 1;
+                       } else if (ret < 0) {
+                               p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Error while writing audio frame: %s\n",
+                                                                       err2str(ret).toLocal8Bit().constData());
+                               return -1;
+                       }
+                       got_packet = 1;
+                       pkt.stream_index = 1;
+                       int ret2 = this->write_frame((void *)oc, (const void *)&c->time_base, (void *)ost->st, (void *)&pkt);
+                       if (ret2 < 0) {
+                               p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Error while writing audio frame: %s\n", err2str(ret2).toLocal8Bit().constData());
+                               return -1;
+                       }
+                       av_packet_unref(&pkt);
+               }
+       }
+       return (frame_dst || got_packet) ? 0 : 1;
+#else
        ret = avcodec_encode_audio2(c, &pkt, frame_dst, &got_packet);
        if (ret < 0) {
                p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Error encoding audio frame: %s\n", err2str(ret).toLocal8Bit().constData());
@@ -260,6 +302,7 @@ int MOVIE_SAVER::write_audio_frame()
                //}
        }
        return (frame_dst || got_packet) ? 0 : 1;
+#endif
 #else
        return 1;
 #endif
@@ -271,10 +314,11 @@ void MOVIE_SAVER::setup_audio(void *_codec_context, void **_codec)
        AVCodecContext *c = (AVCodecContext *)_codec_context;
        AVCodec **codec = (AVCodec **)_codec;
        
-       c->sample_fmt  = (*codec)->sample_fmts ?
-               (*codec)->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
+       #if 1//(LIBAVCODEC_VERSION_MAJOR <= 56)
+       c->sample_fmt  = (*codec)->sample_fmts ? (*codec)->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
        c->bit_rate     = audio_bit_rate;
        c->sample_rate = audio_sample_rate;
+       #endif
        if(c->codec_id == AUDIO_CODEC_AAC) {
                c->strict_std_compliance = -2; // For internal AAC
                c->global_quality = 100;
@@ -287,7 +331,8 @@ void MOVIE_SAVER::setup_audio(void *_codec_context, void **_codec)
                c->cutoff = (audio_sample_rate * 3) / 5;
        } else {
                c->cutoff = audio_sample_rate / 2;
-       }               
+       }
+       #if 1//(LIBAVCODEC_VERSION_MAJOR <= 56)
        if ((*codec)->supported_samplerates) {
                c->sample_rate = (*codec)->supported_samplerates[0];
                for (int i = 0; (*codec)->supported_samplerates[i]; i++) {
@@ -305,5 +350,6 @@ void MOVIE_SAVER::setup_audio(void *_codec_context, void **_codec)
                }
        }
        c->channels             = av_get_channel_layout_nb_channels(c->channel_layout);
+       #endif
 #endif
 }

diff --git a/source/src/qt/avio/movie_saver_fileio.cpp b/source/src/qt/avio/movie_saver_fileio.cpp
index db8ab4a..a215599 100644 (file)
--- a/source/src/qt/avio/movie_saver_fileio.cpp
+++ b/source/src/qt/avio/movie_saver_fileio.cpp
@@ -49,16 +49,12 @@ int MOVIE_SAVER::write_frame(void *_fmt_ctx, const void *_time_base, void *_st,
 }
 
 /* Add an output stream. */
-//static void add_stream(OutputStream *ost, AVFormatContext *oc,
-//                                        AVCodec **codec,
-//                                        enum AVCodecID codec_id)
 bool MOVIE_SAVER::add_stream(void *_ost, void *_oc,
                                           void **_codec,
                                           uint64_t _codec_id)
 {
 #if defined(USE_LIBAV)
        AVCodecContext *c;
-
        OutputStream *ost = (OutputStream *)_ost;
        AVFormatContext *oc = (AVFormatContext *)_oc;
        AVCodec **codec = (AVCodec **)_codec;
@@ -77,14 +73,54 @@ bool MOVIE_SAVER::add_stream(void *_ost, void *_oc,
                return false;
        }
        ost->st->id = oc->nb_streams-1;
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       ost->context = avcodec_alloc_context3(*codec);
+       if (ost->context == NULL) {
+               p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Failed to allocate context for encoding: \n");
+               return false;
+       }
+       AVCodecParameters  *cp = ost->st->codecpar;
+       AVRational ratio;
+       ratio.num = 1;
+       ratio.den = 1;
+       switch ((*codec)->type) {
+       case AVMEDIA_TYPE_AUDIO:
+               cp->codec_type = AVMEDIA_TYPE_AUDIO;
+               cp->codec_id = codec_id;
+               cp->format = (*codec)->sample_fmts ? (*codec)->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
+               cp->bit_rate = audio_bit_rate;
+               cp->channel_layout = AV_CH_LAYOUT_STEREO;
+               cp->channels = 2;
+               cp->sample_rate = audio_sample_rate;
+               cp->frame_size = 1024;
+               break;
+       case AVMEDIA_TYPE_VIDEO:
+               cp->codec_type = AVMEDIA_TYPE_VIDEO;
+               cp->codec_id = codec_id;
+               cp->format = STREAM_PIX_FMT;
+               cp->bit_rate = video_bit_rate;
+               cp->width       = video_geometry.width();
+               cp->height   = video_geometry.height();
+//             cp->profile = ;
+//             cp->level = ;
+               cp->sample_aspect_ratio = ratio;
+               cp->field_order = AV_FIELD_PROGRESSIVE;
+               break;
+       default:
+               break;
+       }
+       avcodec_parameters_to_context(ost->context, cp);
+       c = ost->context;
+#else
        c = ost->st->codec;
-
+#endif
        switch ((*codec)->type) {
        case AVMEDIA_TYPE_AUDIO:
                setup_audio(c, (void **)codec);
                        ost->st->time_base = (AVRational){ 1, c->sample_rate };
                break;
        case AVMEDIA_TYPE_VIDEO:
+       #if 1//(LIBAVCODEC_VERSION_MAJOR <= 56)
                c->codec_id = codec_id;
                c->bit_rate = video_bit_rate;
                // See:
@@ -92,6 +128,7 @@ bool MOVIE_SAVER::add_stream(void *_ost, void *_oc,
                /* Resolution must be a multiple of two. */
                c->width        = video_geometry.width();
                c->height   = video_geometry.height();
+       #endif
                c->thread_count  = video_encode_threads;
                
                /* timebase: This is the fundamental unit of time (in seconds) in terms
@@ -102,7 +139,9 @@ bool MOVIE_SAVER::add_stream(void *_ost, void *_oc,
                c->time_base       = ost->st->time_base;
 
                //c->gop_size     = rec_fps; /* emit one intra frame every one second */
+       #if 1//(LIBAVCODEC_VERSION_MAJOR <= 56)
                c->pix_fmt         = STREAM_PIX_FMT;
+       #endif
                if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
                        /* just for testing, we also add B frames */
                        c->max_b_frames = 2;
@@ -141,14 +180,21 @@ bool MOVIE_SAVER::add_stream(void *_ost, void *_oc,
 void MOVIE_SAVER::close_stream(void *_oc, void *_ost)
 {
 #if defined(USE_LIBAV)
-       AVFormatContext *oc = (AVFormatContext *)_oc;
        OutputStream *ost = (OutputStream *)_ost;
+       #if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       avcodec_close(ost->context);
+       while(avcodec_is_open(ost->context) != 0) { this->msleep(5);}
+       #else
        avcodec_close(ost->st->codec);
        while(avcodec_is_open(ost->st->codec) != 0) { this->msleep(5);}
+       #endif
        av_frame_free(&ost->frame);
        av_frame_free(&ost->tmp_frame);
        sws_freeContext(ost->sws_ctx);
        swr_free(&ost->swr_ctx);
+       #if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       avcodec_free_context(&(ost->context));
+       #endif
 #endif 
 }
 
@@ -184,7 +230,9 @@ bool MOVIE_SAVER::do_open_main()
        memset(&audio_st, 0x00, sizeof(audio_st));
        
        /* Initialize libavcodec, and register all codecs and formats. */
+#if 1//(LIBAVCODEC_VERSION_MAJOR <= 56)
        av_register_all();
+#endif
 
        {
                QString value;
@@ -238,6 +286,7 @@ bool MOVIE_SAVER::do_open_main()
        /* Add the audio and video streams using the default format codecs
         * and initialize the codecs. */
        if (fmt->video_codec != AV_CODEC_ID_NONE) {
+               
                if(!add_stream((void *)&video_st, (void *)oc, (void **)&video_codec, (uint64_t)fmt->video_codec)) goto _err_final;
                have_video = 1;
                encode_video = 1;
@@ -341,10 +390,24 @@ void MOVIE_SAVER::do_close_main()
                                        video_offset = 0;
                                }
                        }
-
+                       int result = 0;
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+                       if(audio_st.context != NULL) {
+                               if(video_st.context != NULL) {
+                                       result = av_compare_ts(video_st.next_pts, video_st.context->time_base,
+                                                                                  audio_st.next_pts, audio_st.context->time_base);
+                               } else {
+                                       result = 1;
+                               }
+                       } else {
+                               result = -1;
+                       }
+#else
+                       result = av_compare_ts(video_st.next_pts, video_st.st->codec->time_base,
+                                                                  audio_st.next_pts, audio_st.st->codec->time_base);
+#endif
                        if ((n_encode_video == 0) &&
-                               ((n_encode_audio != 0) || av_compare_ts(video_st.next_pts, video_st.st->codec->time_base,
-                                                                                                               audio_st.next_pts, audio_st.st->codec->time_base) <= 0)) {
+                               ((n_encode_audio != 0) || (result <= 0))) {
                                n_encode_video = write_video_frame();
                                if(n_encode_video < 0) break;
                        } else {
@@ -355,8 +418,9 @@ void MOVIE_SAVER::do_close_main()
                if (have_video) {
                        close_stream(oc, &video_st);
                }
-               if (have_audio)
+               if (have_audio) {
                        close_stream(oc, &audio_st);
+               }
                have_video = have_audio = 0;
 
                av_write_trailer(oc);

diff --git a/source/src/qt/avio/movie_saver_video.cpp b/source/src/qt/avio/movie_saver_video.cpp
index 194a00b..b0df920 100644 (file)
--- a/source/src/qt/avio/movie_saver_video.cpp
+++ b/source/src/qt/avio/movie_saver_video.cpp
@@ -74,7 +74,7 @@ void MOVIE_SAVER::setup_h264(void *_codec_context)
 
 void MOVIE_SAVER::setup_mpeg4(void *_codec)
 {
-#if defined(USE_LIBAV)
+#if defined(USE_LIBAV) 
        AVCodecContext *c = (AVCodecContext *)_codec;
        c->qmin  = p_config->video_mpeg4_minq;
        c->qmax  = p_config->video_mpeg4_maxq;
@@ -147,9 +147,13 @@ bool MOVIE_SAVER::open_video()
        AVDictionary *opt_arg = raw_options_list;
        OutputStream *ost = &video_st;
        AVCodec *codec = video_codec;
-       AVFormatContext *oc = output_context;
-       AVCodecContext *c = ost->st->codec;
+       AVCodecContext *c;
        AVDictionary *opt = NULL;
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       c = ost->context;
+#else
+       c = ost->st->codec;
+#endif
 
        av_dict_copy(&opt, opt_arg, 0);
 
@@ -225,7 +229,12 @@ void *MOVIE_SAVER::get_video_frame(void)
 {
 #if defined(USE_LIBAV)
        OutputStream *ost = &video_st;
-       AVCodecContext *c = ost->st->codec;
+       AVCodecContext *c;
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       c = ost->context;
+#else
+       c = ost->st->codec;
+#endif
 
        //if (c->pix_fmt != AV_PIX_FMT_YUV420P) {
                /* as we only generate a YUV420P picture, we must convert it
@@ -338,21 +347,55 @@ int MOVIE_SAVER::write_video_frame()
        int got_packet = 0;
        AVPacket pkt = { 0 };
 
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       c = ost->context;
+#else
        c = ost->st->codec;
+#endif
 
        frame = (AVFrame *)get_video_frame();
        av_init_packet(&pkt);
-
        /* encode the image */
        frame->pts = totalDstFrame;
        //got_packet = 1;
        //while(got_packet) {
+#if 0//(LIBAVCODEC_VERSION_MAJOR > 56)
+       if(frame != NULL) {
+               ret = avcodec_send_frame(c, frame);
+               totalDstFrame++;
+               if(ret < 0) {
+                       if(ret == AVERROR_EOF) {
+                               return 0;
+                       }
+                       return ((ret == AVERROR(EAGAIN)) ? 0 : -1);
+               }
+               while (ret  >= 0) {
+                       ret = avcodec_receive_packet(c, &pkt);
+                       if(ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
+                               return (frame || got_packet) ? 0 : 1;
+                       } else if (ret < 0) {
+                               p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Error while writing video frame: %s\n",
+                                                                       err2str(ret).toLocal8Bit().constData());
+                               return -1;
+                       }
+                       pkt.stream_index = 0;
+                       int ret2 = this->write_frame((void *)oc, (const void *)&c->time_base, (void *)ost->st, (void *)&pkt);
+                       if (ret2 < 0) {
+                               p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Error while writing video frame: %s\n", err2str(ret2).toLocal8Bit().constData());
+                               return -1;
+                       }
+                       got_packet = 1;
+                       av_packet_unref(&pkt);
+               }
+       }
+       return (frame || got_packet) ? 0 : 1;
+#else
        ret = avcodec_encode_video2(c, &pkt, frame, &got_packet);
-       //if(!got_packet) break;
        if (ret < 0) {
                p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Error encoding video frame: %s\n", err2str(ret).toLocal8Bit().constData());
                return -1;
        }
+       //if(!got_packet) break;
        totalDstFrame++;
        if (got_packet) {
                ret = this->write_frame((void *)oc, (const void *)&c->time_base, (void *)ost->st, (void *)&pkt);
@@ -361,11 +404,11 @@ int MOVIE_SAVER::write_video_frame()
        } else {
                ret = 0;
        }
-       
        if (ret < 0) {
                p_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_MOVIE_SAVER, "Error while writing video frame: %s\n", err2str(ret).toLocal8Bit().constData());
                return -1;
        }
+       
        //}
        //if(frame) {
        //      char buf[256];
@@ -374,6 +417,7 @@ int MOVIE_SAVER::write_video_frame()
        //      AGAR_DebugLog(AGAR_LOG_DEBUG, "Movie: Write video to file. sec=%s", s);
        //}
        return (frame || got_packet) ? 0 : 1;
+#endif
 #else
        return 1;
 #endif

diff --git a/source/src/qt/avio/sound_loader.cpp b/source/src/qt/avio/sound_loader.cpp
index eb885f4..e310164 100644 (file)
--- a/source/src/qt/avio/sound_loader.cpp
+++ b/source/src/qt/avio/sound_loader.cpp
@@ -50,7 +50,9 @@ bool SOUND_LOADER::open(int id, QString filename)
        _data_size = 0;
        _dataptr = 0;
        /* register all formats and codecs */
+#if (LIBAVCODEC_VERSION_MAJOR <= 56)
        av_register_all();
+#endif
        
        /* open input file, and allocate format context */
        if (avformat_open_input(&fmt_ctx, _filename.toLocal8Bit().constData(), NULL, NULL) < 0) {
@@ -147,7 +149,6 @@ void SOUND_LOADER::close(void)
 int SOUND_LOADER::decode_audio(AVCodecContext *dec_ctx, AVPacket *pkt, AVFrame *frame,
                                                                int *got_frame)
 {
-    int  ch;
     int ret = 0;
 #if (LIBAVCODEC_VERSION_MAJOR > 56)
     /* send the packet with the compressed data to the decoder */