Request 5842 (accepted)

Overview

Request 5842 (accepted)

- Update to version 1.17.5
* Improved handling for discs with mastering errors
* Fixed several bughs related to HD-DVD handling (just about
time...)
* Fixed Linux ARM64 executabe crashing on certain hardware
configurations
* Small improvements and bugfixes
- Use default ffmpeg version

Created by manfred.h 8 months ago
In state accepted
Package maintainers: manfred-h and microchip8

Submit MakeMKV

Submit package home:manfred.h / MakeMKV to package Multimedia / MakeMKV

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.17.4.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.17.5.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.17.4.tar.gz/bin/arm64/makemkvcon -> makemkv-bin-1.17.5.tar.gz/bin/arm64/makemkvcon Changed

makemkv-bin-1.17.4.tar.gz/bin/armhf/makemkvcon -> makemkv-bin-1.17.5.tar.gz/bin/armhf/makemkvcon Changed

makemkv-bin-1.17.4.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.17.5.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.17.4.tar.gz/src/share/blues.jar -> makemkv-bin-1.17.5.tar.gz/src/share/blues.jar Changed

makemkv-oss-1.17.4.tar.gz/configure -> makemkv-oss-1.17.5.tar.gz/configure Changed

@@ -2229,116 +2229,116 @@
 
 } # ac_fn_c_compute_int
 
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
+  eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$5
+$4
 int
 main ()
 {
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
+if (sizeof ($2))
+	 return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$5
+$4
 int
 main ()
 {
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
+if (sizeof (($2)))
+	    return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
+
 else
-  eval "$4=no"
+  eval "$3=yes"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$4
+eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_member
+} # ac_fn_c_check_type
 
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$4
+$5
 int
 main ()
 {
-if (sizeof ($2))
-	 return 0;
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$4
+$5
 int
 main ()
 {
-if (sizeof (($2)))
-	    return 0;
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-
+  eval "$4=yes"
 else
-  eval "$3=yes"
+  eval "$4=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$3
+eval ac_res=\$$4
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_type
+} # ac_fn_c_check_member
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -17217,6 +17217,9 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBAVCODEC_VERSION_MAJOR" >&5
 $as_echo "$LIBAVCODEC_VERSION_MAJOR" >&6; }
 
+if test $LIBAVCODEC_VERSION_MAJOR -lt 55; then
+  as_fn_error $? "The libavcodec library is too old. Please get a recent one from http://www.ffmpeg.org" "$LINENO" 5
+fi
 
 # avcodec_send_frame (new API)
 ac_fn_c_check_decl "$LINENO" "avcodec_send_frame" "ac_cv_have_decl_avcodec_send_frame" "#include <libavcodec/avcodec.h>
@@ -17227,135 +17230,34 @@
 $as_echo "#define FFABI_HAVE_AVCODEC_SEND_FRAME 1" >>confdefs.h
 
 
-  # channels missing in libav
-  ac_fn_c_check_member "$LINENO" "AVFrame" "channels" "ac_cv_member_AVFrame_channels" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_member_AVFrame_channels" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_AV_FRAME_CHANNELS 1" >>confdefs.h
-
-
-fi
-
-
-
 else
 
-
-  # avcodec_encode_audio2 (old API)
-  ac_fn_c_check_func "$LINENO" "avcodec_encode_audio2" "ac_cv_func_avcodec_encode_audio2"
-if test "x$ac_cv_func_avcodec_encode_audio2" = xyes; then :
-
-else
-
-    LIBAVCODEC_VERSION_MAJOR=0;
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "LIBAVCODEC version is too old, need avcodec_send_frame support
+See \`config.log' for more details" "$LINENO" 5; }
 
 fi
 
 
-  # check for ancient frame format
-  ac_fn_c_check_member "$LINENO" "AVFrame" "nb_samples" "ac_cv_member_AVFrame_nb_samples" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_member_AVFrame_nb_samples" = xyes; then :
-
-else
-
-    LIBAVCODEC_VERSION_MAJOR=0;
-
-fi
 
+# check various ffmpeg features
 
-  # we need planar audio
-  ac_fn_c_check_decl "$LINENO" "AV_SAMPLE_FMT_U8P" "ac_cv_have_decl_AV_SAMPLE_FMT_U8P" "#include <libavutil/samplefmt.h>
+ac_fn_c_check_type "$LINENO" "struct AVChannelLayout" "ac_cv_type_struct_AVChannelLayout" "#include <libavcodec/avcodec.h>
 "
-if test "x$ac_cv_have_decl_AV_SAMPLE_FMT_U8P" = xyes; then :
+if test "x$ac_cv_type_struct_AVChannelLayout" = xyes; then :
 
 else
 
-    LIBAVCODEC_VERSION_MAJOR=0;
-
-fi
-
-
-  # check ffmpeg features for old API
-
-  ac_fn_c_check_member "$LINENO" "AVCodecContext" "refcounted_frames" "ac_cv_member_AVCodecContext_refcounted_frames" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_member_AVCodecContext_refcounted_frames" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_REFCOUNTED_FRAMES 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_decl "$LINENO" "avcodec_free_frame" "ac_cv_have_decl_avcodec_free_frame" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_have_decl_avcodec_free_frame" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_AVCODEC_FREE_FRAME 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_decl "$LINENO" "av_frame_free" "ac_cv_have_decl_av_frame_free" "#include <libavutil/frame.h>
-"
-if test "x$ac_cv_have_decl_av_frame_free" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_AV_FRAME_FREE 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_decl "$LINENO" "av_frame_get_channels" "ac_cv_have_decl_av_frame_get_channels" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_have_decl_av_frame_get_channels" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_AV_FRAME_CHANNELS 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_decl "$LINENO" "av_frame_get_sample_rate" "ac_cv_have_decl_av_frame_get_sample_rate" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_have_decl_av_frame_get_sample_rate" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_AV_FRAME_SAMPLE_RATE 1" >>confdefs.h
-
-
-fi
-
-
-  ac_fn_c_check_decl "$LINENO" "av_frame_set_channel_layout" "ac_cv_have_decl_av_frame_set_channel_layout" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_have_decl_av_frame_set_channel_layout" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_AV_FRAME_CHANNEL_LAYOUT 1" >>confdefs.h
-
-
-fi
 
+$as_echo "#define FFABI_HAVE_OLD_CHANNEL_LAYOUT 1" >>confdefs.h
 
 
 fi
 
 
-if test $LIBAVCODEC_VERSION_MAJOR -lt 53; then
-  as_fn_error $? "The libavcodec library is too old. Please get a recent one from http://www.ffmpeg.org" "$LINENO" 5
-fi
-
-# check various ffmpeg features
-
 ac_fn_c_check_func "$LINENO" "av_log_format_line" "ac_cv_func_av_log_format_line"
 if test "x$ac_cv_func_av_log_format_line" = xyes; then :
 
@@ -17366,54 +17268,6 @@
 fi
 
 
-ac_fn_c_check_type "$LINENO" "enum AVCodecID" "ac_cv_type_enum_AVCodecID" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_type_enum_AVCodecID" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_AVCODECID 1" >>confdefs.h
-
-
-else
-
-  ac_fn_c_check_type "$LINENO" "enum CodecID" "ac_cv_type_enum_CodecID" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_type_enum_CodecID" = xyes; then :
-
-else
-
-    as_fn_error $? "Neither AVCodecID nor CodecID defined in libavcodec.h" "$LINENO" 5
-
-fi
-
-
-fi
-
-
-ac_fn_c_check_decl "$LINENO" "AV_CODEC_ID_NONE" "ac_cv_have_decl_AV_CODEC_ID_NONE" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_have_decl_AV_CODEC_ID_NONE" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_AV_CODEC_ID_NAMES 1" >>confdefs.h
-
-
-else
-
-  ac_fn_c_check_decl "$LINENO" "CODEC_ID_NONE" "ac_cv_have_decl_CODEC_ID_NONE" "#include <libavcodec/avcodec.h>
-"
-if test "x$ac_cv_have_decl_CODEC_ID_NONE" = xyes; then :
-
-else
-
-    as_fn_error $? "Neither AV_CODEC_ID_XXX nor CODEC_ID_XXX defined in libavcodec.h" "$LINENO" 5
-
-fi
-
-
-fi
-
-
 ac_fn_c_check_member "$LINENO" "AVCodecParserContext" "duration" "ac_cv_member_AVCodecParserContext_duration" "#include <libavcodec/avcodec.h>
 "
 if test "x$ac_cv_member_AVCodecParserContext_duration" = xyes; then :
@@ -17423,17 +17277,6 @@
 
 
 fi
-
-
-ac_fn_c_check_decl "$LINENO" "AV_CH_TOP_BACK_CENTER" "ac_cv_have_decl_AV_CH_TOP_BACK_CENTER" "#include <libavutil/channel_layout.h>
-"
-if test "x$ac_cv_have_decl_AV_CH_TOP_BACK_CENTER" = xyes; then :
-
-
-$as_echo "#define FFABI_HAVE_AVUTIL_CHANNEL_LAYOUT_H 1" >>confdefs.h
-
-
-fi
 
 
 ac_fn_c_check_func "$LINENO" "av_codec_iterate" "ac_cv_func_av_codec_iterate"

makemkv-oss-1.17.4.tar.gz/libffabi/inc/lgpl/ffabi.h -> makemkv-oss-1.17.5.tar.gz/libffabi/inc/lgpl/ffabi.h Changed

makemkv-oss-1.17.4.tar.gz/libffabi/src/audio_mix.c -> makemkv-oss-1.17.5.tar.gz/libffabi/src/audio_mix.c Changed

@@ -71,8 +71,8 @@
 
     am->in_layout    = in_channel_layout;
     am->out_layout   = out_channel_layout;
-    am->in_channels  = av_get_channel_layout_nb_channels(in_channel_layout);
-    am->out_channels = av_get_channel_layout_nb_channels(out_channel_layout);
+    am->in_channels  = ff_get_channel_layout_nb_channels(in_channel_layout);
+    am->out_channels = ff_get_channel_layout_nb_channels(out_channel_layout);
 
     {
         double *matrix_dbl = av_mallocz(am->out_channels * am->in_channels *
@@ -341,10 +341,10 @@
         CONVERT_MATRIX(q30, av_clipl_int32(llrint(1073741824.0 * v)))
     }
 
-    av_get_channel_layout_string(in_layout_name, sizeof(in_layout_name),
-                                 am->in_channels, am->in_layout);
-    av_get_channel_layout_string(out_layout_name, sizeof(out_layout_name),
-                                 am->out_channels, am->out_layout);
+    ffm_get_channel_layout_string(in_layout_name, sizeof(in_layout_name),
+                                 am->in_layout);
+    ffm_get_channel_layout_string(out_layout_name, sizeof(out_layout_name),
+                                 am->out_layout);
     av_log(&flog, AV_LOG_DEBUG, "audio_mix: %s to %s\n",
            in_layout_name, out_layout_name);
     av_log(&flog, AV_LOG_DEBUG, "matrix size: %d x %d\n",

makemkv-oss-1.17.4.tar.gz/libffabi/src/audio_mix_matrix.c -> makemkv-oss-1.17.5.tar.gz/libffabi/src/audio_mix_matrix.c Changed

makemkv-oss-1.17.4.tar.gz/libffabi/src/ffabi.c -> makemkv-oss-1.17.5.tar.gz/libffabi/src/ffabi.c Changed

@@ -100,30 +100,6 @@
     return (((uint64_t)flags)<<32) | version | 0x80000000;
 }
 
-#ifdef FFABI_AVCODEC_OLD_API
-
-static inline AVFrame *ffm_frame_alloc(void)
-{
-#ifdef FFABI_HAVE_AV_FRAME_FREE
-    return av_frame_alloc();
-#else
-    return avcodec_alloc_frame();
-#endif
-}
-
-static inline void ffm_frame_free(AVFrame **frame)
-{
-#if defined(FFABI_HAVE_AV_FRAME_FREE)
-    av_frame_free(frame);
-#elif defined(FFABI_HAVE_AVCODEC_FREE_FRAME)
-    avcodec_free_frame(frame);
-#else
-    av_freep(frame);
-#endif
-}
-
-#endif
-
 static enum AVSampleFormat translate_sample_fmt(FFM_AudioFormat fmt)
 {
     enum AVSampleFormat r;
@@ -162,12 +138,9 @@
     AVCodec*                codec;
     AVCodecContext*         avctx;
     AVFrame*                frame;
+    AVPacket*               pck;
     unsigned int            nb_samples;
-#ifdef FFABI_AVCODEC_OLD_API
-    int                     have_frame;
-#else
     int                     eos;
-#endif
 };
 
 FFM_AudioDecodeContext* __cdecl ffm_audio_decode_init(void* logctx,const char* name,FFM_AudioFormat fmt,const char* argp,const uint8_t* CodecData,unsigned int CodecDataSize,unsigned int time_base,unsigned int CodecFlags)
@@ -181,7 +154,7 @@
         return NULL;
     }
 
-    ctx->codec = avcodec_find_decoder_by_name(name);
+    ctx->codec = (AVCodec*) avcodec_find_decoder_by_name(name);
     if (!ctx->codec) {
         ffm_audio_decode_close(ctx);
         return NULL;
@@ -195,9 +168,6 @@
     ctx->avctx->opaque = logctx;
     ctx->avctx->time_base.num = 1;
     ctx->avctx->time_base.den = time_base;
-#if defined(FFABI_HAVE_REFCOUNTED_FRAMES) && defined(FFABI_AVCODEC_OLD_API)
-    ctx->avctx->refcounted_frames = 1;
-#endif
 
     if (CodecData) {
         ctx->avctx->extradata = (uint8_t*) CodecData;
@@ -219,30 +189,26 @@
     }
     av_dict_free(&opts);
 
-#ifdef FFABI_AVCODEC_OLD_API
-    ctx->frame = ffm_frame_alloc();
-#else
     ctx->frame = av_frame_alloc();
-#endif
 
     if (!ctx->frame) {
         ffm_audio_decode_close(ctx);
         return NULL;
     }
 
+    ctx->pck = av_packet_alloc();
+    if (!ctx->pck) {
+        ffm_audio_decode_close(ctx);
+        return NULL;
+    }
+
     return ctx;
 }
 
 int __cdecl ffm_audio_decode_close(FFM_AudioDecodeContext* ctx)
 {
-    if (ctx->frame) {
-#ifdef FFABI_AVCODEC_OLD_API
-        av_frame_unref(ctx->frame);
-        ffm_frame_free(&ctx->frame);
-#else
-        av_frame_free(&ctx->frame);
-#endif
-    }
+    av_frame_free(&ctx->frame);
+    av_packet_free(&ctx->pck);
 
     if (ctx->avctx) {
         avcodec_close(ctx->avctx);
@@ -263,81 +229,22 @@
     return (int)(int32_t)v;
 }
 
-
-#ifdef FFABI_AVCODEC_OLD_API
-
-int __cdecl ffm_audio_decode_put_data(FFM_AudioDecodeContext* ctx,const uint8_t* data,unsigned int size,int64_t pts)
-{
-    int                 r=-1;
-    struct AVPacket     avpkt;
-
-    av_init_packet(&avpkt);
-    avpkt.pts = pts;
-    avpkt.dts = pts;
-    avpkt.data = (uint8_t*)data;
-    avpkt.size = size;
-
-    av_frame_unref(ctx->frame);
-    ctx->have_frame = 0;
-
-    r = avcodec_decode_audio4(ctx->avctx,ctx->frame,&ctx->have_frame,&avpkt);
-    if (r != size) { return ffmerr(0,r); }
-
-    if (ctx->have_frame) {
-#ifdef FFABI_HAVE_AV_FRAME_CHANNELS
-        if (av_frame_get_channels(ctx->frame) != ctx->avctx->channels) { return ffmerr(1,av_frame_get_channels(ctx->frame)); }
-#endif
-#ifdef FFABI_HAVE_AV_FRAME_SAMPLE_RATE
-        if (av_frame_get_sample_rate(ctx->frame) != ctx->avctx->sample_rate) { return ffmerr(2,av_frame_get_sample_rate(ctx->frame)); }
-#endif
-        if (ctx->frame->format != ctx->avctx->sample_fmt) { return ffmerr(3,ctx->frame->format); }
-        if (ctx->nb_samples) {
-            if (ctx->nb_samples < ctx->frame->nb_samples) { return ffmerr(5,ctx->frame->nb_samples); }
-        } else {
-            ctx->nb_samples = ctx->frame->nb_samples;
-        }
-    }
-
-    return 0;
-}
-
-int __cdecl ffm_audio_decode_get_frame(FFM_AudioDecodeContext* ctx,int64_t* pts,const uint8_t* data)
-{
-    int i;
-
-    if (!ctx->have_frame) { return 0; }
-
-    ctx->have_frame = 0;
-
-    *pts = ctx->frame->pts;
-
-    data0=ctx->frame->data0;
-
-    if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) {
-        for (i=1;i<ctx->avctx->channels;i++) {
-            datai = ctx->frame->datai;
-        }
-    }
-
-    return ctx->frame->nb_samples;
-}
-
-#else // FFABI_AVCODEC_OLD_API
-
 int __cdecl ffm_audio_decode_put_data(FFM_AudioDecodeContext* ctx,const uint8_t* data,unsigned int size,int64_t pts)
 {
     int r;
 
     if (NULL!=data) {
-        struct AVPacket     avpkt;
 
-        av_init_packet(&avpkt);
-        avpkt.pts = pts;
-        avpkt.dts = pts;
-        avpkt.data = (uint8_t*)data;
-        avpkt.size = size;
+        AVPacket* avpkt = ctx->pck;
+
+        av_packet_unref(avpkt);
 
-        r = avcodec_send_packet(ctx->avctx,&avpkt);
+        avpkt->pts = pts;
+        avpkt->dts = pts;
+        avpkt->data = (uint8_t*)data;
+        avpkt->size = size;
+
+        r = avcodec_send_packet(ctx->avctx,avpkt);
     } else {
         if (!ctx->eos) {
             r = avcodec_send_packet(ctx->avctx,NULL);
@@ -351,7 +258,7 @@
 
 int __cdecl ffm_audio_decode_get_frame(FFM_AudioDecodeContext* ctx,int64_t* pts,const uint8_t* data)
 {
-    int r,i;
+    int r,i,channels;
 
     av_frame_unref(ctx->frame);
 
@@ -360,8 +267,12 @@
     if ( (r==AVERROR_EOF) || (r==AVERROR(EAGAIN)) ) return 0;
     if (r!=0) return r;
 
-#ifdef FFABI_HAVE_AV_FRAME_CHANNELS
-    if (ctx->frame->channels != ctx->avctx->channels) { return ffmerr(1,ctx->frame->channels); }
+#ifdef FFABI_HAVE_OLD_CHANNEL_LAYOUT
+    channels = ctx->avctx->channels;
+    if (ctx->frame->channels != channels) { return ffmerr(1,ctx->frame->channels); }
+#else
+    channels = ctx->avctx->ch_layout.nb_channels;
+    if (ctx->frame->ch_layout.nb_channels != channels) { return ffmerr(1, ctx->frame->ch_layout.nb_channels); }
 #endif
     if (ctx->frame->sample_rate != ctx->avctx->sample_rate) { return ffmerr(2,ctx->frame->sample_rate); }
     if (ctx->frame->format != ctx->avctx->sample_fmt) { return ffmerr(3,ctx->frame->format); }
@@ -376,7 +287,7 @@
     data0=ctx->frame->data0;
 
     if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) {
-        for (i=1;i<ctx->avctx->channels;i++) {
+        for (i=1;i<channels;i++) {
             datai = ctx->frame->extended_datai;
         }
     }
@@ -384,13 +295,16 @@
     return ctx->frame->nb_samples;
 }
 
-#endif
-
 int __cdecl ffm_audio_decode_get_info(FFM_AudioDecodeContext* ctx,FFM_AudioInfo* info)
 {
     info->sample_rate = ctx->avctx->sample_rate;
+#ifdef FFABI_HAVE_OLD_CHANNEL_LAYOUT
     info->channels = ctx->avctx->channels;
     info->channel_layout = ctx->avctx->channel_layout;
+#else
+    info->channels = ctx->avctx->ch_layout.nb_channels;
+    info->channel_layout = (AV_CHANNEL_ORDER_NATIVE == ctx->avctx->ch_layout.order) ? ctx->avctx->ch_layout.u.mask : 0;
+#endif
     info->frame_size = ctx->nb_samples;
     info->sample_fmt = back_translate_sample_fmt(ctx->avctx->sample_fmt);
     info->bits_per_sample = ctx->avctx->bits_per_raw_sample;
@@ -403,13 +317,9 @@
     AVCodec*                codec;
     AVCodecContext*         avctx;
     AVFrame*                frame;
-    AVPacket                pck;
-#ifdef FFABI_AVCODEC_OLD_API
-    int                     have_packet;
-#else
+    AVPacket*               pck;
     uint8_t**               frame_extended_data;
     int                     eos;
-#endif
 };
 
 
@@ -424,11 +334,13 @@
         return NULL;
     }
 
-    av_init_packet(&ctx->pck);
-    ctx->pck.data=NULL;
-    ctx->pck.size=0;
+    ctx->pck = av_packet_alloc();
+    if (!ctx->pck) {
+        ffm_audio_encode_close(ctx);
+        return NULL;
+    }
 
-    ctx->codec = avcodec_find_encoder_by_name(name);
+    ctx->codec = (AVCodec*) avcodec_find_encoder_by_name(name);
     if (!ctx->codec) {
         ffm_audio_encode_close(ctx);
         return NULL;
@@ -439,18 +351,28 @@
         ffm_audio_encode_close(ctx);
         return NULL;
     }
-#if defined(FFABI_AVCODEC_OLD_API) && defined(FFABI_HAVE_REFCOUNTED_FRAMES)
-    ctx->avctx->refcounted_frames = 1;
-#endif
     ctx->avctx->opaque = logctx;
     ctx->avctx->time_base.num = 1;
     ctx->avctx->time_base.den = time_base;
 
     ctx->avctx->sample_fmt = translate_sample_fmt(fmt);
     ctx->avctx->sample_rate = info->sample_rate;
-    ctx->avctx->channels = info->channels;
     ctx->avctx->bits_per_raw_sample = info->bits_per_sample;
+
+#ifdef FFABI_HAVE_OLD_CHANNEL_LAYOUT
+    ctx->avctx->channels = info->channels;
     ctx->avctx->channel_layout = info->channel_layout;
+#else
+    if (av_channel_layout_from_mask(&ctx->avctx->ch_layout, info->channel_layout)) {
+        ffm_audio_encode_close(ctx);
+        return NULL;
+    }
+    if (ctx->avctx->ch_layout.nb_channels != info->channels) {
+        ffm_audio_encode_close(ctx);
+        return NULL;
+    }
+#endif
+
     ctx->avctx->profile = (info->profile != FFM_PROFILE_UNKNOWN) ?
         info->profile : FF_PROFILE_UNKNOWN;
 
@@ -473,19 +395,15 @@
     info->frame_size = ctx->avctx->frame_size;
     info->profile = ctx->avctx->profile;
 
-#ifdef FFABI_AVCODEC_OLD_API
-    ctx->frame = ffm_frame_alloc();
-#else
     ctx->frame = av_frame_alloc();
     if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) {
-        ctx->frame_extended_data = av_mallocz_array(ctx->avctx->channels,
+        ctx->frame_extended_data = av_calloc(info->channels,
             sizeof(*ctx->frame_extended_data));
         if (!ctx->frame_extended_data) {
             ffm_audio_encode_close(ctx);
             return NULL;
         }
     }
-#endif
 
     if (!ctx->frame) {
         ffm_audio_encode_close(ctx);
@@ -497,18 +415,9 @@
 
 int __cdecl ffm_audio_encode_close(FFM_AudioEncodeContext* ctx)
 {
-#ifdef FFABI_AVCODEC_OLD_API
-    av_free_packet(&ctx->pck);
-
-    if (ctx->frame) {
-        av_frame_unref(ctx->frame);
-        ffm_frame_free(&ctx->frame);
-    }
-#else
-    av_packet_unref(&ctx->pck);
+    av_packet_free(&ctx->pck);
     av_frame_free(&ctx->frame);
     av_freep(&ctx->frame_extended_data);
-#endif
 
     if (ctx->avctx) {
         avcodec_close(ctx->avctx);
@@ -520,66 +429,6 @@
     return 0;
 }
 
-#ifdef FFABI_AVCODEC_OLD_API
-
-int __cdecl ffm_audio_encode_put_frame(FFM_AudioEncodeContext* ctx,const uint8_t* frame_data,unsigned int frame_size,unsigned int nb_samples,uint64_t pts)
-{
-    AVFrame* frame;
-
-    av_free_packet(&ctx->pck);
-    av_init_packet(&ctx->pck);
-    ctx->pck.data=NULL;
-    ctx->pck.size=0;
-    ctx->have_packet = 0;
-
-    av_frame_unref(ctx->frame);
-
-    if (frame_data) {
-        frame = ctx->frame;
-        frame->format = ctx->avctx->sample_fmt;
-#ifdef FFABI_HAVE_AV_FRAME_CHANNELS
-        av_frame_set_channels(frame,ctx->avctx->channels);
-#endif
-#ifdef FFABI_HAVE_AV_FRAME_CHANNEL_LAYOUT
-        av_frame_set_channel_layout(frame,ctx->avctx->channel_layout);
-#endif
-        frame->data0 = (uint8_t*)frame_data0;
-        frame->linesize0 = frame_size;
-
-        if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) {
-            int i;
-            for (i=1;i<ctx->avctx->channels;i++) {
-                frame->datai = (uint8_t*)frame_datai;
-            }
-        }
-
-        frame->nb_samples = nb_samples;
-        frame->pts = pts;
-    } else {
-        frame = NULL;
-        if ((ctx->avctx->codec->capabilities&CODEC_CAP_DELAY)==0) {
-            return 0;
-        }
-    }
-
-    return avcodec_encode_audio2(ctx->avctx,&ctx->pck,frame,&ctx->have_packet);
-}
-
-int __cdecl ffm_audio_encode_get_data(FFM_AudioEncodeContext* ctx,unsigned int *size,int64_t *pts,const uint8_t** data)
-{
-    if (ctx->have_packet) {
-        ctx->have_packet = 0;
-        *size = ctx->pck.size;
-        *pts = ctx->pck.pts;
-        *data = ctx->pck.data;
-    } else {
-        *data = NULL;
-    }
-    return 0;
-}
-
-#else
-
 static void ffm_frame_clean(AVFrame* frame)
 {
     frame->extended_data = NULL;
@@ -591,14 +440,21 @@
 int __cdecl ffm_audio_encode_put_frame(FFM_AudioEncodeContext* ctx,const uint8_t* frame_data,unsigned int frame_size,unsigned int nb_samples,uint64_t pts)
 {
     int r;
+    unsigned int channels;
 
     if (frame_data) {
 
         ctx->frame->format = ctx->avctx->sample_fmt;
-#ifdef FFABI_HAVE_AV_FRAME_CHANNELS
+
+#ifdef FFABI_HAVE_OLD_CHANNEL_LAYOUT
+        channels = ctx->avctx->channels;
         ctx->frame->channels = ctx->avctx->channels;
-#endif
         ctx->frame->channel_layout = ctx->avctx->channel_layout;
+#else
+        r = av_channel_layout_copy(&ctx->frame->ch_layout, &ctx->avctx->ch_layout);
+        if (!r) return r;
+        channels = ctx->avctx->ch_layout.nb_channels;
+#endif
         ctx->frame->nb_samples = nb_samples;
         ctx->frame->pts = pts;
         ctx->frame->linesize0 = frame_size;
@@ -611,7 +467,7 @@
             ctx->frame->extended_data = ctx->frame_extended_data;
 
             ctx->frame->extended_data0 = ctx->frame->data0;
-            for (i=1;i<ctx->avctx->channels;i++) {
+            for (i=1;i<channels;i++) {
                 ctx->frame->extended_datai = (uint8_t*)frame_datai;
                 if (i<AV_NUM_DATA_POINTERS) {
                     ctx->frame->datai = ctx->frame->extended_datai;
@@ -642,9 +498,9 @@
 {
     int r;
 
-    av_packet_unref(&ctx->pck);
+    av_packet_unref(ctx->pck);
 
-    r = avcodec_receive_packet(ctx->avctx,&ctx->pck);
+    r = avcodec_receive_packet(ctx->avctx,ctx->pck);
 
     if ( (r==AVERROR_EOF) || (r==AVERROR(EAGAIN)) ) {
         *data = NULL;
@@ -652,15 +508,13 @@
     }
     if (r!=0) return r;
 
-    *size = ctx->pck.size;
-    *pts = ctx->pck.pts;
-    *data = ctx->pck.data;
+    *size = ctx->pck->size;
+    *pts = ctx->pck->pts;
+    *data = ctx->pck->data;
 
     return 0;
 }
 
-#endif
-
 int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncodeInfo* info)
 {
     info->extradata = (const uint8_t*)ctx->avctx->extradata;
@@ -674,27 +528,78 @@
     return 0;
 }
 
-int __cdecl ffm_audio_get_codec_information(FFM_CodecInfo* info,const char* name,int encode)
+#ifndef FFABI_HAVE_OLD_CHANNEL_LAYOUT
+static int set_codec_info_extended(FFM_CodecInfo* info, const AVCodec* codec)
+{
+    char* exinfo;
+    size_t len;
+    unsigned int count_ch_layouts_in = 0;
+    unsigned int count_ch_layouts_out = 0;
+    uint64_t*   channel_layouts;
+    unsigned int i;
+
+    len = strlen(codec->name);
+    if (len >= FFM_CODEC_INFO_NAME_MAX_LENGTH) return -1;
+
+    if (NULL != codec->ch_layouts) {
+        while (0 != codec->ch_layoutscount_ch_layouts_in.nb_channels)
+        {
+            count_ch_layouts_in++;
+        }
+    }
+
+    exinfo = (char*)ffabi_memalign(sizeof(uint64_t), (FFM_CODEC_INFO_NAME_MAX_LENGTH + FFM_CODEC_INFO_EXMARK_LENGTH + ((count_ch_layouts_in+1)*sizeof(uint64_t))));
+    if (NULL == exinfo) return -1;
+
+    memcpy(exinfo, codec->name, len + 1);
+    memcpy(exinfo + FFM_CODEC_INFO_NAME_MAX_LENGTH, FFM_CODEC_INFO_EXMARK_MAGIC, FFM_CODEC_INFO_EXMARK_LENGTH);
+    channel_layouts = (uint64_t*)(exinfo + FFM_CODEC_INFO_NAME_MAX_LENGTH + FFM_CODEC_INFO_EXMARK_LENGTH);
+
+    info->name = exinfo;
+    info->channel_layouts = channel_layouts;
+
+    for (i = 0; i < count_ch_layouts_in; i++)
+    {
+        if (AV_CHANNEL_ORDER_NATIVE != codec->ch_layoutsi.order) continue;
+        channel_layoutscount_ch_layouts_out++ = codec->ch_layoutsi.u.mask;
+    }
+    channel_layoutscount_ch_layouts_out = 0;
+
+    return 0;
+}
+#endif
+
+int __cdecl ffm_audio_get_codec_information(FFM_CodecInfo* info, const char* name, int encode)
 {
     AVCodec* codec;
     int i;
 
-    memset(info,0,sizeof(*info));
+    memset(info, 0, sizeof(*info));
 
     if (encode) {
-        codec = avcodec_find_encoder_by_name(name);
+        codec = (AVCodec*) avcodec_find_encoder_by_name(name);
     } else {
-        codec = avcodec_find_decoder_by_name(name);
+        codec = (AVCodec*) avcodec_find_decoder_by_name(name);
     }
 
     if (!codec) {
-        return ffmerr(1,encode);
+        return ffmerr(1, encode);
     }
 
     info->name = codec->name;
     info->long_name = codec->long_name;
     info->sample_rates = codec->supported_samplerates;
+#ifdef FFABI_HAVE_OLD_CHANNEL_LAYOUT
     info->channel_layouts = codec->channel_layouts;
+#else
+    if (NULL == codec->ch_layouts) {
+        info->channel_layouts = NULL;
+    } else {
+        if (set_codec_info_extended(info, codec)) {
+            return ffmerr(2, 0);
+        }
+    }
+#endif
     info->id = codec->id;
     info->capabilities = codec->capabilities;
     if (codec->profiles) {
@@ -734,7 +639,7 @@
     int                     err,outbuf_size,rest;
     uint8_t                 *outbuf;
 
-    codec = avcodec_find_decoder(AV_CODEC_ID_MLP);
+    codec = (AVCodec*)avcodec_find_decoder(AV_CODEC_ID_MLP);
     if (!codec) {
         err=ffmerr(1,0); goto ret;
     }
@@ -765,9 +670,15 @@
     }
 
     info->sample_rate = avctx->sample_rate;
-    info->channels = avctx->channels;
     info->bits_per_sample = avctx->bits_per_raw_sample;
+#ifdef FFABI_HAVE_OLD_CHANNEL_LAYOUT
+    info->channels = avctx->channels;
     info->channel_layout = avctx->channel_layout;
+#else
+    info->channels = avctx->ch_layout.nb_channels;
+    info->channel_layout = (AV_CHANNEL_ORDER_NATIVE == avctx->ch_layout.order) ? avctx->ch_layout.u.mask : 0;
+#endif
+
     *bitrate = avctx->bit_rate;
 
 #ifndef FFABI_HAVE_PARSER_DURATION
@@ -839,7 +750,14 @@
 
 int __cdecl ffm_get_channel_layout_string(char *buf,int buf_size,uint64_t channel_layout)
 {
+#ifdef FFABI_HAVE_OLD_CHANNEL_LAYOUT
     av_get_channel_layout_string(buf,buf_size,-1,channel_layout);
+#else
+    AVChannelLayout ch_layout;
+
+    if (0!=av_channel_layout_from_mask(&ch_layout,channel_layout)) return -1;
+    av_channel_layout_describe(&ch_layout,buf,buf_size);
+#endif
     return 0;
 }

makemkv-oss-1.17.4.tar.gz/libffabi/src/ffabicfg.h.in -> makemkv-oss-1.17.5.tar.gz/libffabi/src/ffabicfg.h.in Changed

@@ -19,42 +19,18 @@
 
 */
 
-/* AVCodecID */
-#undef FFABI_HAVE_AVCODECID
-
-/* have avcodec_free_frame */
-#undef FFABI_HAVE_AVCODEC_FREE_FRAME
-
 /* have avcodec_send_frame */
 #undef FFABI_HAVE_AVCODEC_SEND_FRAME
 
-/* have av_frame_free */
-#undef FFABI_HAVE_AV_FRAME_FREE
-
-/* AV_CODEC_ID_XXX */
-#undef FFABI_HAVE_AV_CODEC_ID_NAMES
-
-/* have av_frame_get_channels */
-#undef FFABI_HAVE_AV_FRAME_CHANNELS
-
-/* have av_frame_get_sample_rate */
-#undef FFABI_HAVE_AV_FRAME_SAMPLE_RATE
-
-/* have av_frame_set_channel_layout */
-#undef FFABI_HAVE_AV_FRAME_CHANNEL_LAYOUT
-
 /* have av_log_format_line */
 #undef FFABI_HAVE_AV_LOG_FORMAT_LINE
 
 /* have AVCodecParserContext.duration */
 #undef FFABI_HAVE_PARSER_DURATION
 
-/* have refcounted frames */
-#undef FFABI_HAVE_REFCOUNTED_FRAMES
-
-/* have <libavutil/channel_layout.h> */
-#undef FFABI_HAVE_AVUTIL_CHANNEL_LAYOUT_H
-
 /* have av_codec_iterate, no need to call av_codec_register */
 #undef FFABI_HAVE_AV_CODEC_ITERATE
 
+/* no AVChannelLayout */
+#undef FFABI_HAVE_OLD_CHANNEL_LAYOUT
+

makemkv-oss-1.17.4.tar.gz/libffabi/src/internal.h -> makemkv-oss-1.17.5.tar.gz/libffabi/src/internal.h Changed

@@ -24,6 +24,7 @@
 #include <libavutil/samplefmt.h>
 #include <libavutil/mem.h>
 #include <libavutil/log.h>
+#include <libavutil/channel_layout.h>
 #include <libavcodec/avcodec.h>
 #include <libavcodec/version.h>
 
@@ -56,45 +57,21 @@
 void ffabi_free(void *ptr);
 
 
-#if (LIBAVCODEC_VERSION_MAJOR < 53)
-#error "Can't use an ancient ffmpeg or libav"
+#if (LIBAVCODEC_VERSION_MAJOR < 55)
+#error "Can't use an ancient ffmpeg"
 #endif
 
 #include "ffabicfg.h"
 
-#ifndef AV_CODEC_FLAG_GLOBAL_HEADER
-#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-#endif
-
-#ifndef FFABI_HAVE_AVCODEC_SEND_FRAME
-
-#define FFABI_AVCODEC_OLD_API 1
-
-#ifndef FFABI_HAVE_AVCODECID
-#define AVCodecID CodecID
-#endif
-
-#ifndef FFABI_HAVE_AV_CODEC_ID_NAMES
-#define AV_CODEC_ID_NONE CODEC_ID_NONE
-#define AV_CODEC_ID_MLP CODEC_ID_MLP
-#define AV_CODEC_ID_TRUEHD CODEC_ID_TRUEHD
-#endif
-
-#ifndef FFABI_HAVE_REFCOUNTED_FRAMES
-static inline void av_frame_unref(AVFrame *frame)
-{
-}
-#endif
-
-#endif // FFABI_AVCODEC_OLD_API
-
 #ifndef FFABI_HAVE_AV_LOG_FORMAT_LINE
 void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl,
                         char *line, int line_size, int *print_prefix);
 #endif
 
-#ifdef FFABI_HAVE_AVUTIL_CHANNEL_LAYOUT_H
-#include <libavutil/channel_layout.h>
-#endif
+static int ff_get_channel_layout_nb_channels(uint64_t channel_layout)
+{
+    return av_popcount64(channel_layout);
+}
+
 
 #endif /* FFABI_INTERNAL_H */

makemkv-oss-1.17.4.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.17.5.tar.gz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.17.4.tar.gz/mmgpl/dvdnav/vm/play.c -> makemkv-oss-1.17.5.tar.gz/mmgpl/dvdnav/vm/play.c Changed

Build Results
RPM Lint

Refresh

Comments for request 5842 0

Request History

manfred.h created request 8 months ago

manfred.h accepted request 8 months ago