Commit 6bfe3c89 authored by Jose Lopes's avatar Jose Lopes Committed by Commit Bot
parent 923fe126
...@@ -115,10 +115,10 @@ void EsParserAdts::SkipAdtsFrame(const AdtsFrame& adts_frame) { ...@@ -115,10 +115,10 @@ void EsParserAdts::SkipAdtsFrame(const AdtsFrame& adts_frame) {
es_queue_->Pop(adts_frame.size); es_queue_->Pop(adts_frame.size);
} }
EsParserAdts::EsParserAdts(const NewAudioConfigCB& new_audio_config_cb, EsParserAdts::EsParserAdts(NewAudioConfigCB new_audio_config_cb,
EmitBufferCB emit_buffer_cb, EmitBufferCB emit_buffer_cb,
bool sbr_in_mimetype) bool sbr_in_mimetype)
: new_audio_config_cb_(new_audio_config_cb), : new_audio_config_cb_(std::move(new_audio_config_cb)),
emit_buffer_cb_(std::move(emit_buffer_cb)), emit_buffer_cb_(std::move(emit_buffer_cb)),
#if BUILDFLAG(ENABLE_HLS_SAMPLE_AES) #if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
get_decrypt_config_cb_(), get_decrypt_config_cb_(),
...@@ -128,12 +128,12 @@ EsParserAdts::EsParserAdts(const NewAudioConfigCB& new_audio_config_cb, ...@@ -128,12 +128,12 @@ EsParserAdts::EsParserAdts(const NewAudioConfigCB& new_audio_config_cb,
} }
#if BUILDFLAG(ENABLE_HLS_SAMPLE_AES) #if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
EsParserAdts::EsParserAdts(const NewAudioConfigCB& new_audio_config_cb, EsParserAdts::EsParserAdts(NewAudioConfigCB new_audio_config_cb,
EmitBufferCB emit_buffer_cb, EmitBufferCB emit_buffer_cb,
GetDecryptConfigCB get_decrypt_config_cb, GetDecryptConfigCB get_decrypt_config_cb,
EncryptionScheme init_encryption_scheme, EncryptionScheme init_encryption_scheme,
bool sbr_in_mimetype) bool sbr_in_mimetype)
: new_audio_config_cb_(new_audio_config_cb), : new_audio_config_cb_(std::move(new_audio_config_cb)),
emit_buffer_cb_(std::move(emit_buffer_cb)), emit_buffer_cb_(std::move(emit_buffer_cb)),
get_decrypt_config_cb_(std::move(get_decrypt_config_cb)), get_decrypt_config_cb_(std::move(get_decrypt_config_cb)),
init_encryption_scheme_(init_encryption_scheme), init_encryption_scheme_(init_encryption_scheme),
......
...@@ -31,13 +31,14 @@ namespace mp2t { ...@@ -31,13 +31,14 @@ namespace mp2t {
class MEDIA_EXPORT EsParserAdts : public EsParser { class MEDIA_EXPORT EsParserAdts : public EsParser {
public: public:
typedef base::Callback<void(const AudioDecoderConfig&)> NewAudioConfigCB; using NewAudioConfigCB =
base::RepeatingCallback<void(const AudioDecoderConfig&)>;
EsParserAdts(const NewAudioConfigCB& new_audio_config_cb, EsParserAdts(NewAudioConfigCB new_audio_config_cb,
EmitBufferCB emit_buffer_cb, EmitBufferCB emit_buffer_cb,
bool sbr_in_mimetype); bool sbr_in_mimetype);
#if BUILDFLAG(ENABLE_HLS_SAMPLE_AES) #if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
EsParserAdts(const NewAudioConfigCB& new_audio_config_cb, EsParserAdts(NewAudioConfigCB new_audio_config_cb,
EmitBufferCB emit_buffer_cb, EmitBufferCB emit_buffer_cb,
GetDecryptConfigCB get_decrypt_config_cb, GetDecryptConfigCB get_decrypt_config_cb,
EncryptionScheme init_encryption_scheme, EncryptionScheme init_encryption_scheme,
......
...@@ -13,7 +13,7 @@ static void EmitBuffer(scoped_refptr<media::StreamParserBuffer> buffer) {} ...@@ -13,7 +13,7 @@ static void EmitBuffer(scoped_refptr<media::StreamParserBuffer> buffer) {}
// Entry point for LibFuzzer. // Entry point for LibFuzzer.
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
media::mp2t::EsParserAdts es_parser(base::Bind(&NewAudioConfig), media::mp2t::EsParserAdts es_parser(base::BindRepeating(&NewAudioConfig),
base::BindRepeating(&EmitBuffer), true); base::BindRepeating(&EmitBuffer), true);
if (!es_parser.Parse(data, size, media::kNoTimestamp, if (!es_parser.Parse(data, size, media::kNoTimestamp,
media::kNoDecodeTimestamp())) { media::kNoDecodeTimestamp())) {
......
...@@ -38,11 +38,11 @@ EsParserAdtsTest::EsParserAdtsTest() { ...@@ -38,11 +38,11 @@ EsParserAdtsTest::EsParserAdtsTest() {
bool EsParserAdtsTest::Process(const std::vector<Packet>& pes_packets, bool EsParserAdtsTest::Process(const std::vector<Packet>& pes_packets,
bool sbr_in_mimetype) { bool sbr_in_mimetype) {
EsParserAdts es_parser( EsParserAdts es_parser(base::BindRepeating(&EsParserAdtsTest::NewAudioConfig,
base::Bind(&EsParserAdtsTest::NewAudioConfig, base::Unretained(this)), base::Unretained(this)),
base::BindRepeating(&EsParserAdtsTest::EmitBuffer, base::BindRepeating(&EsParserAdtsTest::EmitBuffer,
base::Unretained(this)), base::Unretained(this)),
sbr_in_mimetype); sbr_in_mimetype);
return ProcessPesPackets(&es_parser, pes_packets, false /* force_timing */); return ProcessPesPackets(&es_parser, pes_packets, false /* force_timing */);
} }
......
...@@ -29,7 +29,8 @@ namespace mp2t { ...@@ -29,7 +29,8 @@ namespace mp2t {
class MEDIA_EXPORT EsParserMpeg1Audio : public EsParser { class MEDIA_EXPORT EsParserMpeg1Audio : public EsParser {
public: public:
typedef base::Callback<void(const AudioDecoderConfig&)> NewAudioConfigCB; using NewAudioConfigCB =
base::RepeatingCallback<void(const AudioDecoderConfig&)>;
EsParserMpeg1Audio(const NewAudioConfigCB& new_audio_config_cb, EsParserMpeg1Audio(const NewAudioConfigCB& new_audio_config_cb,
EmitBufferCB emit_buffer_cb, EmitBufferCB emit_buffer_cb,
......
...@@ -17,9 +17,9 @@ static void EmitBuffer(scoped_refptr<media::StreamParserBuffer> buffer) {} ...@@ -17,9 +17,9 @@ static void EmitBuffer(scoped_refptr<media::StreamParserBuffer> buffer) {}
// Entry point for LibFuzzer. // Entry point for LibFuzzer.
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
media::NullMediaLog media_log; media::NullMediaLog media_log;
media::mp2t::EsParserMpeg1Audio es_parser(base::Bind(&NewAudioConfig), media::mp2t::EsParserMpeg1Audio es_parser(
base::BindRepeating(&EmitBuffer), base::BindRepeating(&NewAudioConfig), base::BindRepeating(&EmitBuffer),
&media_log); &media_log);
if (es_parser.Parse(data, size, media::kNoTimestamp, if (es_parser.Parse(data, size, media::kNoTimestamp,
media::kNoDecodeTimestamp())) { media::kNoDecodeTimestamp())) {
es_parser.Flush(); es_parser.Flush();
......
...@@ -39,8 +39,8 @@ bool EsParserMpeg1AudioTest::Process( ...@@ -39,8 +39,8 @@ bool EsParserMpeg1AudioTest::Process(
const std::vector<Packet>& pes_packets, const std::vector<Packet>& pes_packets,
bool force_timing) { bool force_timing) {
EsParserMpeg1Audio es_parser( EsParserMpeg1Audio es_parser(
base::Bind(&EsParserMpeg1AudioTest::NewAudioConfig, base::BindRepeating(&EsParserMpeg1AudioTest::NewAudioConfig,
base::Unretained(this)), base::Unretained(this)),
base::BindRepeating(&EsParserMpeg1AudioTest::EmitBuffer, base::BindRepeating(&EsParserMpeg1AudioTest::EmitBuffer,
base::Unretained(this)), base::Unretained(this)),
&media_log_); &media_log_);
......
...@@ -405,7 +405,7 @@ std::unique_ptr<EsParser> Mp2tStreamParser::CreateH264Parser(int pes_pid) { ...@@ -405,7 +405,7 @@ std::unique_ptr<EsParser> Mp2tStreamParser::CreateH264Parser(int pes_pid) {
} }
std::unique_ptr<EsParser> Mp2tStreamParser::CreateAacParser(int pes_pid) { std::unique_ptr<EsParser> Mp2tStreamParser::CreateAacParser(int pes_pid) {
auto on_audio_config_changed = base::Bind( auto on_audio_config_changed = base::BindRepeating(
&Mp2tStreamParser::OnAudioConfigChanged, base::Unretained(this), pes_pid); &Mp2tStreamParser::OnAudioConfigChanged, base::Unretained(this), pes_pid);
auto on_emit_audio_buffer = base::BindRepeating( auto on_emit_audio_buffer = base::BindRepeating(
&Mp2tStreamParser::OnEmitAudioBuffer, base::Unretained(this), pes_pid); &Mp2tStreamParser::OnEmitAudioBuffer, base::Unretained(this), pes_pid);
...@@ -416,7 +416,7 @@ std::unique_ptr<EsParser> Mp2tStreamParser::CreateAacParser(int pes_pid) { ...@@ -416,7 +416,7 @@ std::unique_ptr<EsParser> Mp2tStreamParser::CreateAacParser(int pes_pid) {
std::unique_ptr<EsParser> Mp2tStreamParser::CreateMpeg1AudioParser( std::unique_ptr<EsParser> Mp2tStreamParser::CreateMpeg1AudioParser(
int pes_pid) { int pes_pid) {
auto on_audio_config_changed = base::Bind( auto on_audio_config_changed = base::BindRepeating(
&Mp2tStreamParser::OnAudioConfigChanged, base::Unretained(this), pes_pid); &Mp2tStreamParser::OnAudioConfigChanged, base::Unretained(this), pes_pid);
auto on_emit_audio_buffer = base::BindRepeating( auto on_emit_audio_buffer = base::BindRepeating(
&Mp2tStreamParser::OnEmitAudioBuffer, base::Unretained(this), pes_pid); &Mp2tStreamParser::OnEmitAudioBuffer, base::Unretained(this), pes_pid);
...@@ -453,7 +453,7 @@ std::unique_ptr<EsParser> Mp2tStreamParser::CreateEncryptedH264Parser( ...@@ -453,7 +453,7 @@ std::unique_ptr<EsParser> Mp2tStreamParser::CreateEncryptedH264Parser(
std::unique_ptr<EsParser> Mp2tStreamParser::CreateEncryptedAacParser( std::unique_ptr<EsParser> Mp2tStreamParser::CreateEncryptedAacParser(
int pes_pid, int pes_pid,
bool emit_clear_buffers) { bool emit_clear_buffers) {
auto on_audio_config_changed = base::Bind( auto on_audio_config_changed = base::BindRepeating(
&Mp2tStreamParser::OnAudioConfigChanged, base::Unretained(this), pes_pid); &Mp2tStreamParser::OnAudioConfigChanged, base::Unretained(this), pes_pid);
auto on_emit_audio_buffer = base::BindRepeating( auto on_emit_audio_buffer = base::BindRepeating(
&Mp2tStreamParser::OnEmitAudioBuffer, base::Unretained(this), pes_pid); &Mp2tStreamParser::OnEmitAudioBuffer, base::Unretained(this), pes_pid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment