Skip to content

Commit d577bdc

Browse files
carlonlucacarlonluca
committed
Release 5.4.0-beta1.
1 parent 5abbeab commit d577bdc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1500
-1136
lines changed

‎piomxtextures_app/main.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ extern "C" {
3939
#include "omx_videosurfaceelement.h"
4040
#include "omx_camerasurfaceelement.h"
4141
#include "omx_mediaprocessorelement.h"
42-
#include "omx_audioprocessor.h"
4342
#include "omx_mediaprocessor.h"
4443
#include "lc_logging.h"
4544

‎piomxtextures_qt_driver/mediaplayer/openmaxilplayercontrol.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ void OpenMAXILPlayerControl::setPosition(qint64 position)
321321
+-----------------------------------------------------------------------------*/
322322
void OpenMAXILPlayerControl::setVolume(int volume)
323323
{
324+
// volume is in [0, 100] here.
324325
log_debug("Setting volume to: %d.", volume);
325326
m_mediaProcessor->setVolume(volume, true);
326327
}

‎piomxtextures_src/omx_audioprocessor.cpp‎

Lines changed: 0 additions & 545 deletions
This file was deleted.

‎piomxtextures_src/omx_audioprocessor.h‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎piomxtextures_src/omx_mediaprocessor.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ OMX_MediaProcessor::OMX_MediaProcessor(OMX_EGLBufferProviderSh provider) :
226226
moveToThread(m_thread);
227227
m_thread->start();
228228

229-
setVolume(1, true);
229+
setVolume(100, true);
230230
INVOKE("init", INVOKE_CONN);
231231
}
232232

@@ -428,10 +428,10 @@ bool OMX_MediaProcessor::setFilenameInt(const QString& filename)
428428
m_omx_reader->GetHints(OMXSTREAM_AUDIO, m_audioConfig->hints);
429429

430430
#if 0
431-
if ((m_hints_audio.codec == CODEC_ID_AC3 || m_hints_audio.codec == CODEC_ID_EAC3) &&
431+
if ((m_hints_audio.codec == AV_CODEC_ID_AC3 || m_hints_audio.codec == AV_CODEC_ID_EAC3) &&
432432
m_BcmHost.vc_tv_hdmi_audio_supported(EDID_AudioFormat_eAC3, 2, EDID_AudioSampleRate_e44KHz, EDID_AudioSampleSize_16bit ) != 0)
433433
m_passthrough = false;
434-
if (m_hints_audio.codec == CODEC_ID_DTS &&
434+
if (m_hints_audio.codec == AV_CODEC_ID_DTS &&
435435
m_BcmHost.vc_tv_hdmi_audio_supported(EDID_AudioFormat_eDTS, 2, EDID_AudioSampleRate_e44KHz, EDID_AudioSampleSize_16bit ) != 0)
436436
m_passthrough = false;
437437
#endif
@@ -689,6 +689,8 @@ void OMX_MediaProcessor::setVolume(long volume, bool linear)
689689
{
690690
QMutexLocker locker(&m_sendCmd);
691691

692+
// volume is supposed to be in percentage here.
693+
692694
#define VOL_MAX 1
693695
#define VOL_MIN 0
694696

‎piomxtextures_src/omxplayer_lib/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ ffmpeg_compiled
66
ffmpeg
77
help.h
88
keys.h
9+
patch.flag

‎piomxtextures_src/omxplayer_lib/BitstreamConverter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ bool CBitstreamConverter::Open(enum AVCodecID codec, uint8_t *in_extradata, int
440440

441441
switch(codec)
442442
{
443-
case CODEC_ID_H264:
443+
case AV_CODEC_ID_H264:
444444
if (in_extrasize < 7 || in_extradata == NULL)
445445
{
446446
CLog::Log(LOGERROR, "CBitstreamConverter::Open avcC data too small or missing\n");
@@ -584,7 +584,7 @@ bool CBitstreamConverter::Convert(uint8_t *pData, int iSize)
584584

585585
if (pData)
586586
{
587-
if(m_codec == CODEC_ID_H264)
587+
if(m_codec == AV_CODEC_ID_H264)
588588
{
589589
if(m_to_annexb)
590590
{

‎piomxtextures_src/omxplayer_lib/DllAvCodec.h‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ class DllAvCodecInterface
7575
virtual AVCodec *avcodec_find_decoder(enum AVCodecID id)=0;
7676
virtual AVCodec *avcodec_find_encoder(enum AVCodecID id)=0;
7777
virtual int avcodec_close_dont_call(AVCodecContext *avctx)=0;
78-
virtual AVFrame *avcodec_alloc_frame(void)=0;
79-
virtual int avpicture_fill(AVPicture *picture, uint8_t *ptr, PixelFormat pix_fmt, int width, int height)=0;
78+
virtual AVFrame *av_frame_alloc(void)=0;
79+
virtual int avpicture_fill(AVPicture *picture, uint8_t *ptr, AVPixelFormat pix_fmt, int width, int height)=0;
8080
virtual int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt)=0;
8181
virtual int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, AVPacket *avpkt)=0;
8282
virtual int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, AVPacket *avpkt)=0;
83-
virtual int avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples)=0;
84-
virtual int avpicture_get_size(PixelFormat pix_fmt, int width, int height)=0;
83+
virtual int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr)=0;
84+
virtual int avpicture_get_size(AVPixelFormat pix_fmt, int width, int height)=0;
8585
virtual AVCodecContext *avcodec_alloc_context3(AVCodec *codec)=0;
8686
virtual void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)=0;
8787
virtual void avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec)=0;
@@ -98,10 +98,9 @@ class DllAvCodecInterface
9898
virtual void av_bitstream_filter_close(AVBitStreamFilterContext *bsfc) =0;
9999
virtual void avpicture_free(AVPicture *picture)=0;
100100
virtual void av_free_packet(AVPacket *pkt)=0;
101-
virtual int avpicture_alloc(AVPicture *picture, PixelFormat pix_fmt, int width, int height)=0;
102-
virtual enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt)=0;
103-
virtual int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic)=0;
104-
virtual void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)=0;
101+
virtual int avpicture_alloc(AVPicture *picture, AVPixelFormat pix_fmt, int width, int height)=0;
102+
virtual enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt)=0;
103+
virtual int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *pic, int flags)=0;
105104
virtual AVCodec *av_codec_next(AVCodec *c)=0;
106105
virtual int av_dup_packet(AVPacket *pkt)=0;
107106
virtual void av_init_packet(AVPacket *pkt)=0;
@@ -131,13 +130,13 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
131130
{
132131
return ::avcodec_close(avctx);
133132
}
134-
virtual AVFrame *avcodec_alloc_frame() { return ::avcodec_alloc_frame(); }
135-
virtual int avpicture_fill(AVPicture *picture, uint8_t *ptr, PixelFormat pix_fmt, int width, int height) { return ::avpicture_fill(picture, ptr, pix_fmt, width, height); }
133+
virtual AVFrame *av_frame_alloc() { return ::av_frame_alloc(); }
134+
virtual int avpicture_fill(AVPicture *picture, uint8_t *ptr, AVPixelFormat pix_fmt, int width, int height) { return ::avpicture_fill(picture, ptr, pix_fmt, width, height); }
136135
virtual int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt) { return ::avcodec_decode_video2(avctx, picture, got_picture_ptr, avpkt); }
137136
virtual int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, AVPacket *avpkt) { return ::avcodec_decode_audio4(avctx, frame, got_frame_ptr, avpkt); }
138137
virtual int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, AVPacket *avpkt) { return ::avcodec_decode_subtitle2(avctx, sub, got_sub_ptr, avpkt); }
139-
virtual int avcodec_encode_audio(AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples) { return ::avcodec_encode_audio(avctx, buf, buf_size, samples); }
140-
virtual int avpicture_get_size(PixelFormat pix_fmt, int width, int height) { return ::avpicture_get_size(pix_fmt, width, height); }
138+
virtual int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { return ::avcodec_encode_audio2(avctx, avpkt, frame, got_packet_ptr); }
139+
virtual int avpicture_get_size(AVPixelFormat pix_fmt, int width, int height) { return ::avpicture_get_size(pix_fmt, width, height); }
141140
virtual AVCodecContext *avcodec_alloc_context3(AVCodec *codec) { return ::avcodec_alloc_context3(codec); }
142141
virtual void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) { ::avcodec_string(buf, buf_size, enc, encode); }
143142
virtual void avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec) { ::avcodec_get_context_defaults3(s, codec); }
@@ -160,10 +159,9 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
160159

161160
virtual void avpicture_free(AVPicture *picture) { ::avpicture_free(picture); }
162161
virtual void av_free_packet(AVPacket *pkt) { ::av_free_packet(pkt); }
163-
virtual int avpicture_alloc(AVPicture *picture, PixelFormat pix_fmt, int width, int height) { return ::avpicture_alloc(picture, pix_fmt, width, height); }
164-
virtual int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic) { return ::avcodec_default_get_buffer(s, pic); }
165-
virtual void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) { ::avcodec_default_release_buffer(s, pic); }
166-
virtual enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt) { return ::avcodec_default_get_format(s, fmt); }
162+
virtual int avpicture_alloc(AVPicture *picture, AVPixelFormat pix_fmt, int width, int height) { return ::avpicture_alloc(picture, pix_fmt, width, height); }
163+
virtual int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *pic, int flags) { return ::avcodec_default_get_buffer2(s, pic, flags); }
164+
virtual enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt) { return ::avcodec_default_get_format(s, fmt); }
167165
virtual AVCodec *av_codec_next(AVCodec *c) { return ::av_codec_next(c); }
168166

169167
virtual int av_dup_packet(AVPacket *pkt) { return ::av_dup_packet(pkt); }
@@ -186,7 +184,7 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
186184
DEFINE_FUNC_ALIGNED4(int, __cdecl, avcodec_decode_video2, AVCodecContext*, AVFrame*, int*, AVPacket*)
187185
DEFINE_FUNC_ALIGNED4(int, __cdecl, avcodec_decode_audio4, AVCodecContext*, AVFrame*, int*, AVPacket*)
188186
DEFINE_FUNC_ALIGNED4(int, __cdecl, avcodec_decode_subtitle2, AVCodecContext*, AVSubtitle*, int*, AVPacket*)
189-
DEFINE_FUNC_ALIGNED4(int, __cdecl, avcodec_encode_audio, AVCodecContext*, uint8_t*, int, const short*)
187+
DEFINE_FUNC_ALIGNED4(int, __cdecl, avcodec_encode_audio2, avcodec_encode_audio2, *avctx, AVPacket *, const AVFrame *, int *)
190188
DEFINE_FUNC_ALIGNED1(AVCodecContext*, __cdecl, avcodec_alloc_context3, AVCodec *)
191189
DEFINE_FUNC_ALIGNED1(AVCodecParserContext*, __cdecl, av_parser_init, int)
192190
DEFINE_FUNC_ALIGNED9(int, __cdecl, av_parser_parse2, AVCodecParserContext*,AVCodecContext*, uint8_t**, int*, const uint8_t*, int, int64_t, int64_t, int64_t)
@@ -199,9 +197,9 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
199197
DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum AVCodecID p1))
200198
DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum AVCodecID p1))
201199
DEFINE_METHOD1(int, avcodec_close_dont_call, (AVCodecContext *p1))
202-
DEFINE_METHOD0(AVFrame*, avcodec_alloc_frame)
203-
DEFINE_METHOD5(int, avpicture_fill, (AVPicture *p1, uint8_t *p2, PixelFormat p3, int p4, int p5))
204-
DEFINE_METHOD3(int, avpicture_get_size, (PixelFormat p1, int p2, int p3))
200+
DEFINE_METHOD0(AVFrame*, av_frame_alloc)
201+
DEFINE_METHOD5(int, avpicture_fill, (AVPicture *p1, uint8_t *p2, AVPixelFormat p3, int p4, int p5))
202+
DEFINE_METHOD3(int, avpicture_get_size, (AVPixelFormat p1, int p2, int p3))
205203
DEFINE_METHOD4(void, avcodec_string, (char *p1, int p2, AVCodecContext *p3, int p4))
206204
DEFINE_METHOD2(void, avcodec_get_context_defaults3, (AVCodecContext *p1, AVCodec *p2))
207205
DEFINE_METHOD1(void, av_parser_close, (AVCodecParserContext *p1))
@@ -210,10 +208,9 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
210208
DEFINE_METHOD8(int, av_bitstream_filter_filter, (AVBitStreamFilterContext* p1, AVCodecContext* p2, const char* p3, uint8_t** p4, int* p5, const uint8_t* p6, int p7, int p8))
211209
DEFINE_METHOD1(void, av_bitstream_filter_close, (AVBitStreamFilterContext *p1))
212210
DEFINE_METHOD1(void, av_free_packet, (AVPacket *p1))
213-
DEFINE_METHOD4(int, avpicture_alloc, (AVPicture *p1, PixelFormat p2, int p3, int p4))
214-
DEFINE_METHOD2(int, avcodec_default_get_buffer, (AVCodecContext *p1, AVFrame *p2))
215-
DEFINE_METHOD2(void, avcodec_default_release_buffer, (AVCodecContext *p1, AVFrame *p2))
216-
DEFINE_METHOD2(enum PixelFormat, avcodec_default_get_format, (struct AVCodecContext *p1, const enum PixelFormat *p2))
211+
DEFINE_METHOD4(int, avpicture_alloc, (AVPicture *p1, AVPixelFormat p2, int p3, int p4))
212+
DEFINE_METHOD2(int, avcodec_default_get_buffer2, (AVCodecContext *p1, AVFrame *p2, int flags))
213+
DEFINE_METHOD2(enum AVPixelFormat, avcodec_default_get_format, (struct AVCodecContext *p1, const enum AVPixelFormat *p2))
217214

218215
DEFINE_METHOD1(AVCodec*, av_codec_next, (AVCodec *p1))
219216
BEGIN_METHOD_RESOLVE()
@@ -222,13 +219,13 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
222219
RESOLVE_METHOD_RENAME(avcodec_close,avcodec_close_dont_call)
223220
RESOLVE_METHOD(avcodec_find_decoder)
224221
RESOLVE_METHOD(avcodec_find_encoder)
225-
RESOLVE_METHOD(avcodec_alloc_frame)
222+
RESOLVE_METHOD(av_frame_alloc)
226223
RESOLVE_METHOD_RENAME(avcodec_register_all, avcodec_register_all_dont_call)
227224
RESOLVE_METHOD(avpicture_fill)
228225
RESOLVE_METHOD(avcodec_decode_video2)
229226
RESOLVE_METHOD(avcodec_decode_audio4)
230227
RESOLVE_METHOD(avcodec_decode_subtitle2)
231-
RESOLVE_METHOD(avcodec_encode_audio)
228+
RESOLVE_METHOD(avcodec_encode_audio2)
232229
RESOLVE_METHOD(avpicture_get_size)
233230
RESOLVE_METHOD(avcodec_alloc_context3)
234231
RESOLVE_METHOD(avcodec_string)
@@ -242,8 +239,7 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
242239
RESOLVE_METHOD(avpicture_free)
243240
RESOLVE_METHOD(avpicture_alloc)
244241
RESOLVE_METHOD(av_free_packet)
245-
RESOLVE_METHOD(avcodec_default_get_buffer)
246-
RESOLVE_METHOD(avcodec_default_release_buffer)
242+
RESOLVE_METHOD(avcodec_default_get_buffer2)
247243
RESOLVE_METHOD(avcodec_default_get_format)
248244
RESOLVE_METHOD(av_codec_next)
249245
RESOLVE_METHOD(av_dup_packet)

‎piomxtextures_src/omxplayer_lib/DllAvFormat.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ class DllAvFormatInterface
9090
virtual void avio_wb32(AVIOContext *s, unsigned int val)=0;
9191
virtual void avio_wb16(AVIOContext *s, unsigned int val)=0;
9292
virtual AVFormatContext *avformat_alloc_context(void)=0;
93+
virtual int av_set_options_string(AVFormatContext *ctx, const char *opts,
94+
const char *key_val_sep, const char *pairs_sep)=0;
9395
virtual AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c)=0;
9496
virtual AVOutputFormat *av_guess_format(const char *short_name, const char *filename, const char *mime_type)=0;
9597
virtual int avformat_write_header (AVFormatContext *s, AVDictionary **options)=0;
@@ -144,6 +146,8 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
144146
virtual void avio_wb32(AVIOContext *s, unsigned int val) { ::avio_wb32(s, val); }
145147
virtual void avio_wb16(AVIOContext *s, unsigned int val) { ::avio_wb16(s, val); }
146148
virtual AVFormatContext *avformat_alloc_context() { return ::avformat_alloc_context(); }
149+
virtual int av_set_options_string(AVFormatContext *ctx, const char *opts,
150+
const char *key_val_sep, const char *pairs_sep) { return ::av_set_options_string(ctx, opts, key_val_sep, pairs_sep); }
147151
virtual AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c) { return ::avformat_new_stream(s, c); }
148152
virtual AVOutputFormat *av_guess_format(const char *short_name, const char *filename, const char *mime_type) { return ::av_guess_format(short_name, filename, mime_type); }
149153
virtual int avformat_write_header (AVFormatContext *s, AVDictionary **options) { return ::avformat_write_header (s, options); }
@@ -199,6 +203,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
199203
DEFINE_METHOD2(int, avio_close_dyn_buf, (AVIOContext *p1, uint8_t **p2))
200204
DEFINE_METHOD3(offset_t, avio_seek, (AVIOContext *p1, offset_t p2, int p3))
201205
DEFINE_METHOD0(AVFormatContext *, avformat_alloc_context)
206+
DEFINE_METHOD4(int, av_set_options_string, (AVFormatContext *p1, const char *p2, const char *p3, const char *p4))
202207
DEFINE_METHOD2(AVStream *, avformat_new_stream, (AVFormatContext *p1, AVCodec *p2))
203208
DEFINE_METHOD3(AVOutputFormat *, av_guess_format, (const char *p1, const char *p2, const char *p3))
204209
DEFINE_METHOD2(int, avformat_write_header , (AVFormatContext *p1, AVDictionary **p2))
@@ -234,6 +239,7 @@ class DllAvFormat : public DllDynamic, DllAvFormatInterface
234239
RESOLVE_METHOD(avio_wb32)
235240
RESOLVE_METHOD(avio_wb16)
236241
RESOLVE_METHOD(avformat_alloc_context)
242+
RESOLVE_METHOD(av_set_options_string)
237243
RESOLVE_METHOD(avformat_new_stream)
238244
RESOLVE_METHOD(av_guess_format)
239245
RESOLVE_METHOD(avformat_write_header)

‎piomxtextures_src/omxplayer_lib/DllAvUtil.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ class DllAvUtilInterface
112112
virtual int av_get_bytes_per_sample(enum AVSampleFormat p1) = 0;
113113
virtual AVDictionaryEntry *av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags) = 0;
114114
virtual int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags)=0;
115+
virtual int av_dict_parse_string(AVDictionary **pm, const char *str, const char *key_val_sep, const char *pairs_sep, int flags)=0;
115116
virtual void av_dict_free(AVDictionary **pm) = 0;
116117
virtual int av_samples_get_buffer_size (int *linesize, int nb_channels, int nb_samples, enum AVSampleFormat sample_fmt, int align) = 0;
117118
virtual int64_t av_get_default_channel_layout(int nb_channels)=0;
@@ -163,6 +164,7 @@ class DllAvUtilBase : public DllDynamic, DllAvUtilInterface
163164
{ return ::av_get_bytes_per_sample(p1); }
164165
virtual AVDictionaryEntry *av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags){ return ::av_dict_get(m, key, prev, flags); }
165166
virtual int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags) { return ::av_dict_set(pm, key, value, flags); }
167+
virtual int av_dict_parse_string(AVDictionary **pm, const char *str, const char *key_val_sep, const char *pairs_sep, int flags) { return ::av_dict_parse_string(pm, str, key_val_sep, pairs_sep, flags); }
166168
virtual void av_dict_free(AVDictionary **pm) { ::av_dict_free(pm); }
167169
virtual int av_samples_get_buffer_size (int *linesize, int nb_channels, int nb_samples, enum AVSampleFormat sample_fmt, int align)
168170
{ return ::av_samples_get_buffer_size(linesize, nb_channels, nb_samples, sample_fmt, align); }
@@ -224,6 +226,7 @@ class DllAvUtilBase : public DllDynamic, DllAvUtilInterface
224226
DEFINE_METHOD1(int, av_get_bytes_per_sample, (enum AVSampleFormat p1))
225227
DEFINE_METHOD4(AVDictionaryEntry *, av_dict_get, (AVDictionary *p1, const char *p2, const AVDictionaryEntry *p3, int p4))
226228
DEFINE_METHOD4(int, av_dict_set, (AVDictionary **p1, const char *p2, const char *p3, int p4));
229+
DEFINE_METHOD5(int, av_dict_parse_string, (AVDictionary **p1, const char *p2, const char *p3, const char *p4, int p5));
227230
DEFINE_METHOD1(void, av_dict_free, (AVDictionary **p1));
228231
DEFINE_METHOD5(int, av_samples_get_buffer_size, (int *p1, int p2, int p3, enum AVSampleFormat p4, int p5))
229232
DEFINE_METHOD1(int64_t, av_get_default_channel_layout, (int p1))
@@ -266,6 +269,7 @@ class DllAvUtilBase : public DllDynamic, DllAvUtilInterface
266269
RESOLVE_METHOD(av_get_bytes_per_sample)
267270
RESOLVE_METHOD(av_dict_get)
268271
RESOLVE_METHOD(av_dict_set)
272+
RESOLVE_METHOD(av_dict_parse_string)
269273
RESOLVE_METHOD(av_dict_free)
270274
RESOLVE_METHOD(av_samples_get_buffer_size)
271275
RESOLVE_METHOD(av_get_default_channel_layout)

0 commit comments

Comments
 (0)