[FFmpeg-devel] [FFmpeg-cvslog] lavf/cafenc: Allow muxing opus.

[James Almer]

> ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com <http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog>> | Tue Oct 17 21:35:28 2017 +0200| [a3accd0c3768933f15422c9dec596da0f436d786] | committer: Carl Eugen Hoyos
>
> lavf/cafenc: Allow muxing opus.
>
> QuickTime does not require the (unknown) kuki chunk for decoding.

This at the very least requires limiting muxing to mono and stereo
streams (The only kind of streams that work without channel mapping
information in extradata), and a check for -strict experimental.

Also, I'd have rather waited for Apple to update their docs about Opus
in CAF. Quicktime seemingly playing such files isn't reason enough to
risk creating potentially non-spec compliant files.

>
> >/http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3accd0c3768933f15422c9dec596da0f436d786
> /---
>
>  libavformat/cafenc.c  | 3 ++-
>  libavformat/version.h | 2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c
> index f550cd965a..211b046563 100644
> --- a/libavformat/cafenc.c
> +++ b/libavformat/cafenc.c
> @@ -81,6 +81,8 @@ static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels, int bl
>          return 320;
>      case AV_CODEC_ID_MP1:
>          return 384;
> +    case AV_CODEC_ID_OPUS:
> +        return 960;
>      case AV_CODEC_ID_MP2:
>      case AV_CODEC_ID_MP3:
>          return 1152;
> @@ -117,7 +119,6 @@ static int caf_write_header(AVFormatContext *s)
>  
>      switch (par->codec_id) {
>      case AV_CODEC_ID_AAC:
> -    case AV_CODEC_ID_OPUS:
>          av_log(s, AV_LOG_ERROR, "muxing codec currently unsupported\n");
>          return AVERROR_PATCHWELCOME;
>      }
> diff --git a/libavformat/version.h b/libavformat/version.h
> index 828be14b20..22f82a37f7 100644
> --- a/libavformat/version.h
> +++ b/libavformat/version.h
> @@ -33,7 +33,7 @@
>  // Also please add any ticket numbers that you believe might be affected here
>  #define LIBAVFORMAT_VERSION_MAJOR  57
>  #define LIBAVFORMAT_VERSION_MINOR  84
> -#define LIBAVFORMAT_VERSION_MICRO 100
> +#define LIBAVFORMAT_VERSION_MICRO 101
>  
>  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
>                                                 LIBAVFORMAT_VERSION_MINOR, \