[Cin] 'nb_index_entries' in 'AVStream' gone in ffmpeg 5
Andrew Randrianasulu
randrianasulu at gmail.com
Sat Apr 2 12:19:01 CEST 2022
so, using this page
https://blog.fearcat.in/a?ID=01700-325c95d6-306d-4c1a-b3bf-07ab14a4bd8c
i tried to fix obvious errors (attached) , now it compiles, but linker (lld
from llvm) fails <our fault somewhere + android's threading> so I can't test
On Friday, April 1, 2022, Phyllis Smith <phylsmith2017 at gmail.com> wrote:
> This news is very worrisome. The Freelance who "fixed" bluray for ffmpeg
> 4.4 got Covid and never heard back from him which is unfortunate because he
> had some experience with ffmpeg.
>
> On Fri, Apr 1, 2022 at 2:02 PM Andrew Randrianasulu via Cin <
> cin at lists.cinelerra-gg.org> wrote:
>
>> Hello!
>>
>> I try to make our software (Cinelerra-gg, non-linear video editor [0])
>> compile-able with latest ffmpeg, right now I down to 7 errors:
>>
>> ffmpeg.C:726:11: error: no member named 'nb_index_entries' in 'AVStream'
>> if( st->nb_index_entries > 0 ) tstmp = st->index_entries[0].timestamp;
>> ~~ ^ ffmpeg.C:726:46: error: no member named 'index_entries' in 'AVStream'
>> if( st->nb_index_entries > 0 ) tstmp = st->index_entries[0].timestamp;
>> ~~ ^ ffmpeg.C:728:16: error: no member named 'first_dts' in 'AVStream' else
>> if( st->first_dts != AV_NOPTS_VALUE ) tstmp = st->first_dts; ~~ ^
>> ffmpeg.C:728:58: error: no member named 'first_dts' in 'AVStream' else if(
>> st->first_dts != AV_NOPTS_VALUE ) tstmp = st->first_dts; ~~ ^
>>
>> ffmpeg.C:3030:35: error: no member named 'codec' in 'AVStream' ret =
>> avcodec_copy_context(st->codec, ctx); ~~ ^
>>
>> ffmpeg.C:4092:19: error: no member named 'nb_index_entries' in 'AVStream'
>> int nb_ent = st->nb_index_entries; ~~ ^ ffmpeg.C:4095:27: error: no member
>> named 'index_entries' in 'AVStream' AVIndexEntry *ep =
>> &st->index_entries[nb_ent-1]; ~~ ^
>> 18 warnings and 7 errors generated.
>> make[2]: *** [Makefile:570: armv8l/ffmpeg.o] Error 1
>>
>>
>> sorry for formatting, copy/pasting from termux ( linux-on-android
>> terminal emulator + distribution)
>>
>> so i guess those errs caused by
>>
>> https://github.com/FFmpeg/FFmpeg/commit/557953a397dfdd9c7a3d
>> 8c2f60d1204599e3d3ac
>>
>> (adds specific av_ functions for manipulating those index entries)
>>
>> https://github.com/FFmpeg/FFmpeg/commit/3749eede66c377479976
>> 6b1f246afae8a6ffc9bb
>>
>> (remove deprecated AVStream.codec - how to use replacement? )
>>
>> and
>>
>> https://github.com/FFmpeg/FFmpeg/commit/591b88e6787c4e678237
>> f02a50421d101abd25c2
>> "avformat: move AVStream.{first,cur}_dts to AVStreamInternal
>> They are private fields, no reason to have them exposed in a public
>> header.
>>
>> Signed-off-by: James Almer <jamrial at gmail.com>"
>>
>> while I hope to learn how to use new functions - I do not think I can
>> replace whole seeking logic with something new? can those fields added
>> back, or at least can you add some new functions to get them?
>>
>> I try to compile with dynamic ffmpeg, so my configure line for
>> cinelerra-gg is
>>
>> $ ./configure --with-single-user --without-thirdparty --without-dvb
>> --without-video4linux2 --without-dv --without-firewire --without-libzmpeg
>> --without-vdpau --without-vaapi --without-lv2 --without-openexr
>>
>> our default is static linking, but at some point we hope to get new
>> ffmpeg (and experimental bsd support I work on requires dynamic linking, so
>> as soon as pkgsrc moves to new ffmpeg we are broken)
>>
>>
>> [0] https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=
>> blob;f=cinelerra-5.1/cinelerra/fileffmpeg.C;h=a6437242ddd633
>> 973252b2fcac7a9f9f4bab9e84;hb=HEAD
>> --
>> Cin mailing list
>> Cin at lists.cinelerra-gg.org
>> https://lists.cinelerra-gg.org/mailman/listinfo/cin
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.cinelerra-gg.org/pipermail/cin/attachments/20220402/52f7bdd7/attachment.htm>
-------------- next part --------------
diff --git a/cinelerra-5.1/cinelerra/bdwrite.C b/cinelerra-5.1/cinelerra/bdwrite.C
index 4dd5cc37..57966ead 100644
--- a/cinelerra-5.1/cinelerra/bdwrite.C
+++ b/cinelerra-5.1/cinelerra/bdwrite.C
@@ -2530,7 +2530,7 @@ static int field_probe(AVFormatContext *fmt_ctx, AVStream *st)
AVDictionary *copts = 0;
//av_dict_copy(&copts, opts, 0);
AVCodecID codec_id = st->codecpar->codec_id;
- AVCodec *decoder = avcodec_find_decoder(codec_id);
+ const AVCodec *decoder = avcodec_find_decoder(codec_id);
AVCodecContext *ctx = avcodec_alloc_context3(decoder);
if( !ctx ) {
fprintf(stderr,"codec alloc failed\n");
@@ -2604,7 +2604,7 @@ int media_info::scan()
stream *s = new stream(type, i);
s->pid = st->id;
AVCodecID codec_id = st->codecpar->codec_id;
- AVCodec *decoder = avcodec_find_decoder(codec_id);
+ const AVCodec *decoder = avcodec_find_decoder(codec_id);
s->ctx = avcodec_alloc_context3(decoder);
if( !s->ctx ) {
fprintf(stderr, "avcodec_alloc_context failed\n");
diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 3655d643..294343fb 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -381,7 +381,7 @@ AVHWDeviceType FFStream::decode_hw_activate()
return AV_HWDEVICE_TYPE_NONE;
}
-int FFStream::decode_hw_format(AVCodec *decoder, AVHWDeviceType type)
+int FFStream::decode_hw_format(const AVCodec *decoder, AVHWDeviceType type)
{
return 0;
}
@@ -406,7 +406,7 @@ int FFStream::decode_activate()
}
while( ret >= 0 && st != 0 && !reading ) {
AVCodecID codec_id = st->codecpar->codec_id;
- AVCodec *decoder = 0;
+ const AVCodec *decoder = 0;
if( is_video() ) {
if( ffmpeg->opt_video_decoder )
decoder = avcodec_find_decoder_by_name(ffmpeg->opt_video_decoder);
@@ -722,10 +722,11 @@ int FFStream::seek(int64_t no, double rate)
double secs = pos < 0 ? 0. : pos / rate;
AVRational time_base = st->time_base;
int64_t tstmp = time_base.num > 0 ? secs * time_base.den/time_base.num : 0;
+ int nb_index_entries = avformat_index_get_entries_count(st);
if( !tstmp ) {
- if( st->nb_index_entries > 0 ) tstmp = st->index_entries[0].timestamp;
+ if( nb_index_entries > 0 ) tstmp = (avformat_index_get_entry(st, 0))->timestamp;
else if( st->start_time != AV_NOPTS_VALUE ) tstmp = st->start_time;
- else if( st->first_dts != AV_NOPTS_VALUE ) tstmp = st->first_dts;
+ /* else if( st->first_dts != AV_NOPTS_VALUE ) tstmp = st->first_dts; */
else tstmp = INT64_MIN+1;
}
else if( nudge != AV_NOPTS_VALUE ) tstmp += nudge;
@@ -1850,7 +1851,7 @@ FFMPEG::~FFMPEG()
delete [] opt_hw_dev;
}
-int FFMPEG::check_sample_rate(AVCodec *codec, int sample_rate)
+int FFMPEG::check_sample_rate(const AVCodec *codec, int sample_rate)
{
const int *p = codec->supported_samplerates;
if( !p ) return sample_rate;
@@ -2100,7 +2101,7 @@ void FFMPEG::scan_audio_options(Asset *asset, EDL *edl)
cin_fmt = (int)av_get_sample_fmt(cin_sample_fmt);
if( cin_fmt < 0 ) {
char audio_codec[BCSTRLEN]; audio_codec[0] = 0;
- AVCodec *av_codec = !FFMPEG::get_codec(audio_codec, "audio", asset->acodec) ?
+ const AVCodec *av_codec = !FFMPEG::get_codec(audio_codec, "audio", asset->acodec) ?
avcodec_find_encoder_by_name(audio_codec) : 0;
if( av_codec && av_codec->sample_fmts )
cin_fmt = find_best_sample_fmt_of_list(av_codec->sample_fmts, AV_SAMPLE_FMT_FLT);
@@ -2136,7 +2137,7 @@ void FFMPEG::scan_video_options(Asset *asset, EDL *edl)
cin_fmt = (int)av_get_pix_fmt(cin_pix_fmt);
if( cin_fmt < 0 ) {
char video_codec[BCSTRLEN]; video_codec[0] = 0;
- AVCodec *av_codec = !get_codec(video_codec, "video", asset->vcodec) ?
+ const AVCodec *av_codec = !get_codec(video_codec, "video", asset->vcodec) ?
avcodec_find_encoder_by_name(video_codec) : 0;
if( av_codec && av_codec->pix_fmts ) {
if( 0 && edl ) { // frequently picks a bad answer
@@ -2331,9 +2332,9 @@ int FFCodecRemaps::add(const char *val)
}
-int FFCodecRemaps::update(AVCodecID &codec_id, AVCodec *&decoder)
+int FFCodecRemaps::update(AVCodecID &codec_id, const AVCodec *&decoder)
{
- AVCodec *codec = avcodec_find_decoder(codec_id);
+ const AVCodec *codec = avcodec_find_decoder(codec_id);
if( !codec ) return -1;
const char *name = codec->name;
FFCodecRemaps &map = *this;
@@ -2553,7 +2554,7 @@ int FFMPEG::init_decoder(const char *filename)
char *sp = strrchr(bp, '.');
if( !sp ) sp = bp + strlen(bp);
FILE *fp = 0;
- AVInputFormat *ifmt = 0;
+ const AVInputFormat *ifmt = 0;
if( sp ) {
strcpy(sp, ".opts");
fp = fopen(file_opts, "r");
@@ -2774,7 +2775,7 @@ int FFMPEG::open_encoder(const char *type, const char *spec)
AVCodecContext *ctx = 0;
const AVCodecDescriptor *codec_desc = 0;
- AVCodec *codec = avcodec_find_encoder_by_name(codec_name);
+ const AVCodec *codec = avcodec_find_encoder_by_name(codec_name);
if( !codec ) {
eprintf(_("cant find codec %s:%s\n"), codec_name, filename);
ret = 1;
@@ -3027,7 +3028,12 @@ int FFMPEG::open_encoder(const char *type, const char *spec)
}
if( ret >= 0 ) {
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
- ret = avcodec_copy_context(st->codec, ctx);
+ //ret = avcodec_copy_context(st->codec, ctx);
+ //AVCodecContext *codec_ctx = avcodec_alloc_context3(ctx);
+ ret = avcodec_parameters_to_context(ctx, st->codecpar);
+ // if (ret < 0)
+ // fprintf(stderr, "could not copy codecpar to tmp codec_ctx\n");
+ //ret = avcodec_parameters_from_context(codec_ctx,
_Pragma("GCC diagnostic warning \"-Wdeprecated-declarations\"")
if( ret < 0 )
fprintf(stderr, "Could not copy the stream context\n");
@@ -3672,7 +3678,7 @@ Preferences *FFMPEG::ff_prefs()
double FFVideoStream::get_rotation_angle()
{
- int size = 0;
+ size_t size = 0;
int *matrix = (int*)av_stream_get_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, &size);
int len = size/sizeof(*matrix);
if( !matrix || len < 5 ) return 0;
@@ -3897,7 +3903,7 @@ AVCodecContext *FFMPEG::activate_decoder(AVStream *st)
AVDictionary *copts = 0;
av_dict_copy(&copts, opts, 0);
AVCodecID codec_id = st->codecpar->codec_id;
- AVCodec *decoder = 0;
+ const AVCodec *decoder = 0;
switch( st->codecpar->codec_type ) {
case AVMEDIA_TYPE_VIDEO:
if( opt_video_decoder )
@@ -4089,10 +4095,11 @@ void FFStream::load_markers(IndexMarks &marks, double rate)
int in = 0;
int64_t sz = marks.size();
int max_entries = fmt_ctx->max_index_size / sizeof(AVIndexEntry) - 1;
- int nb_ent = st->nb_index_entries;
+ int nb_ent = avformat_index_get_entries_count(st);
// some formats already have an index
if( nb_ent > 0 ) {
- AVIndexEntry *ep = &st->index_entries[nb_ent-1];
+ // AVIndexEntry *ep = &st->index_entries[nb_ent-1];
+ const AVIndexEntry *ep = avformat_index_get_entry(st, nb_ent-1);
int64_t tstmp = ep->timestamp;
if( nudge != AV_NOPTS_VALUE ) tstmp -= nudge;
double secs = ffmpeg->to_secs(tstmp, st->time_base);
diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index 4f1624ce..6c7d68e0 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -25,6 +25,7 @@
#include "vframe.inc"
extern "C" {
+#include "libavcodec/bsf.h"
#include "libavformat/avformat.h"
#include "libavformat/avio.h"
#include "libavcodec/avcodec.h"
@@ -86,7 +87,7 @@ public:
virtual int encode_activate();
virtual int decode_activate();
virtual AVHWDeviceType decode_hw_activate();
- virtual int decode_hw_format(AVCodec *decoder, AVHWDeviceType type);
+ virtual int decode_hw_format(const AVCodec *decoder, AVHWDeviceType type);
virtual int write_packet(FFPacket &pkt);
int read_packet();
int seek(int64_t no, double rate);
@@ -290,7 +291,7 @@ class FFCodecRemaps : public ArrayList<FFCodecRemap>
public:
FFCodecRemaps() {}
int add(const char *val);
- int update(AVCodecID &codec_id, AVCodec *&decoder);
+ int update(AVCodecID &codec_id, const AVCodec *&decoder);
};
// for get_initial_timecode auto deletes
@@ -331,7 +332,7 @@ public:
static void ff_lock(const char *cp=0) { fflock.lock(cp); }
static void ff_unlock() { fflock.unlock(); }
- int check_sample_rate(AVCodec *codec, int sample_rate);
+ int check_sample_rate(const AVCodec *codec, int sample_rate);
AVRational check_frame_rate(const AVRational *p, double frame_rate);
AVRational to_sample_aspect_ratio(Asset *asset);
AVRational to_time_base(int sample_rate);
More information about the Cin
mailing list