February 2023 - MPlayer-cvslog - lists.mplayerhq.hu

r38412 - trunk/configure
by reimar 20 Feb '23

20 Feb '23

Author: reimar Date: Tue Feb 21 00:41:00 2023 New Revision: 38412 Log: configure: update for latest FFmpeg. Just remove the AV/FF prefixes for the allformats/codecs parsing. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Feb 21 00:39:50 2023 (r38411) +++ trunk/configure Tue Feb 21 00:41:00 2023 (r38412) @@ -1592,26 +1592,26 @@ list_subparts_filters() { } echocheck "ffmpeg/libavcodec/allcodecs.c" -libavdecoders_all=$(list_subparts_extern FFCodec decoder codec/allcodecs.c) -libavencoders_all=$(list_subparts_extern FFCodec encoder codec/allcodecs.c) -libavparsers_all=$(list_subparts_extern AVCodecParser parser codec/parsers.c) +libavdecoders_all=$(list_subparts_extern Codec decoder codec/allcodecs.c) +libavencoders_all=$(list_subparts_extern Codec encoder codec/allcodecs.c) +libavparsers_all=$(list_subparts_extern CodecParser parser codec/parsers.c) test $? -eq 0 && _list_subparts=found || _list_subparts="not found" echores "$_list_subparts" echocheck "ffmpeg/libavcodec/hwaccels.h" -libavhwaccels_all=$(list_subparts_extern AVHWAccel hwaccel codec/hwaccels.h) +libavhwaccels_all=$(list_subparts_extern HWAccel hwaccel codec/hwaccels.h) test $? -eq 0 || libavhwaccels_all=$(list_subparts HWACCEL hwaccel codec/allcodecs.c) test $? -eq 0 && _list_subparts=found || _list_subparts="not found" echores "$_list_subparts" echocheck "ffmpeg/libavformat/allformats.c" -libavdemuxers_all=$(list_subparts_extern AVInputFormat demuxer format/allformats.c) -libavmuxers_all=$(list_subparts_extern AVOutputFormat muxer format/allformats.c) +libavdemuxers_all=$(list_subparts_extern InputFormat demuxer format/allformats.c) +libavmuxers_all=$(list_subparts_extern OutputFormat muxer format/allformats.c) test $? -eq 0 && _list_subparts=found || _list_subparts="not found" echores "$_list_subparts" echocheck "ffmpeg/libavcodec/bitsteram_filters.c" -libavbsfs_all=$(list_subparts_extern FFBitStreamFilter bsf codec/bitstream_filters.c) +libavbsfs_all=$(list_subparts_extern BitStreamFilter bsf codec/bitstream_filters.c) test $? -eq 0 && _list_subparts_extern=found || _list_subparts_extern="not found" echores "$_list_subparts_extern"

1 0

r38411 - trunk/libmpcodecs/ad_spdif.c
by reimar 20 Feb '23

20 Feb '23

Author: reimar Date: Tue Feb 21 00:39:50 2023 New Revision: 38411 Log: ad_spdif.c: Use proper way to set avformat option. Modified: trunk/libmpcodecs/ad_spdif.c Modified: trunk/libmpcodecs/ad_spdif.c ============================================================================== --- trunk/libmpcodecs/ad_spdif.c Fri Feb 3 22:22:31 2023 (r38410) +++ trunk/libmpcodecs/ad_spdif.c Tue Feb 21 00:39:50 2023 (r38411) @@ -79,7 +79,7 @@ static int preinit(sh_audio_t *sh) static int init(sh_audio_t *sh) { - int i, x, in_size, srate, bps, *dtshd_rate, res; + int i, x, in_size, srate, bps, res; unsigned char *start; double pts; static const struct { @@ -97,6 +97,7 @@ static int init(sh_audio_t *sh) AVStream *stream = NULL; const AVOption *opt = NULL; struct spdifContext *spdif_ctx = NULL; + AVDictionary *opts = NULL; spdif_ctx = av_mallocz(sizeof(*spdif_ctx)); if (!spdif_ctx) @@ -112,9 +113,6 @@ static int init(sh_audio_t *sh) lavf_ctx->oformat = av_guess_format(FILENAME_SPDIFENC, NULL, NULL); if (!lavf_ctx->oformat) goto fail; - lavf_ctx->priv_data = av_mallocz(lavf_ctx->oformat->priv_data_size); - if (!lavf_ctx->priv_data) - goto fail; lavf_ctx->pb = avio_alloc_context(spdif_ctx->pb_buffer, OUTBUF_SIZE, 1, spdif_ctx, read_packet, write_packet, seek); if (!lavf_ctx->pb) @@ -130,12 +128,17 @@ static int init(sh_audio_t *sh) break; } } - if ((res = avformat_write_header(lavf_ctx, NULL)) < 0) { + // FORCE USE DTS-HD + if (lavf_ctx->streams[0]->codecpar->codec_id == AV_CODEC_ID_DTS) + av_dict_set(&opts, "dtshd_rate", "768000" /* 192000*4 */, 0); + if ((res = avformat_write_header(lavf_ctx, opts)) < 0) { + av_dict_free(&opts); if (res == AVERROR_PATCHWELCOME) mp_msg(MSGT_DECAUDIO,MSGL_INFO, "This codec is not supported by spdifenc.\n"); goto fail; } + av_dict_free(&opts); spdif_ctx->header_written = 1; // get sample_rate & bitrate from parser @@ -177,13 +180,6 @@ static int init(sh_audio_t *sh) sh->i_bps = bps; break; case AV_CODEC_ID_DTS: // FORCE USE DTS-HD - opt = av_opt_find(&lavf_ctx->oformat->priv_class, - "dtshd_rate", NULL, 0, 0); - if (!opt) - goto fail; - dtshd_rate = (int*)(((uint8_t*)lavf_ctx->priv_data) + - opt->offset); - *dtshd_rate = 192000*4; spdif_ctx->iec61937_packet_size = 32768; sh->sample_format = AF_FORMAT_IEC61937_LE; sh->samplerate = 192000; // DTS core require 48000

1 0

r38410 - trunk/libmpcodecs/ve_lavc.c
by reimar 03 Feb '23

03 Feb '23

Author: reimar Date: Fri Feb 3 22:22:31 2023 New Revision: 38410 Log: ve_lavc: Fix av_reallocp_array usage. Reported by Jeremie Courreges-Anglas <jca at wxcvbn org> and Brad Smith <brad at comstyle com> Modified: trunk/libmpcodecs/ve_lavc.c Modified: trunk/libmpcodecs/ve_lavc.c ============================================================================== --- trunk/libmpcodecs/ve_lavc.c Thu Feb 2 00:14:09 2023 (r38409) +++ trunk/libmpcodecs/ve_lavc.c Fri Feb 3 22:22:31 2023 (r38410) @@ -441,8 +441,7 @@ static int config(struct vf_instance *vf mp_msg(MSGT_MENCODER,MSGL_ERR,"error parsing vrc_q\n"); return 0; } - lavc_venc_context->rc_override= - av_reallocp_array(lavc_venc_context->rc_override, i+1, sizeof(*lavc_venc_context->rc_override)); + av_reallocp_array(&lavc_venc_context->rc_override, i+1, sizeof(*lavc_venc_context->rc_override)); lavc_venc_context->rc_override[i].start_frame= start; lavc_venc_context->rc_override[i].end_frame = end; if(q>0){

1 0

r38409 - trunk/configure
by reimar 01 Feb '23

01 Feb '23

Author: reimar Date: Thu Feb 2 00:14:09 2023 New Revision: 38409 Log: configure: Add RISCV to arch_all to silence warnings. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jan 1 17:00:21 2023 (r38408) +++ trunk/configure Thu Feb 2 00:14:09 2023 (r38409) @@ -2169,7 +2169,7 @@ def_fast_unaligned='#define HAVE_FAST_UN def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 0' def_local_aligned='#define HAVE_LOCAL_ALIGNED 0' def_vsx='#define HAVE_VSX 0' -arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC AARCH64 LOONGARCH LOONGARCH64' +arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC AARCH64 LOONGARCH LOONGARCH64 RISCV' subarch_all='X86_32 X86_64 PPC64' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)

1 0