Bug 1374774: P3. Remove HasSPS method. r=gerald

It was only used in one spot, and incorrectly at that.

MozReview-Commit-ID: EWkkrAlYT7W

--HG--
extra : rebase_source : 9c719bbf668eafaac0415580ffdfa0cea0942673
This commit is contained in:
Jean-Yves Avenard 2017-06-22 14:44:21 +02:00
Родитель da6d087d1b
Коммит bcd57adc64
3 изменённых файлов: 1 добавлений и 8 удалений

Просмотреть файл

@ -520,7 +520,7 @@ MP4TrackDemuxer::GetSamples(int32_t aNumSamples)
} }
for (const auto& sample : samples->mSamples) { for (const auto& sample : samples->mSamples) {
// Collect telemetry from h264 Annex B SPS. // Collect telemetry from h264 Annex B SPS.
if (mNeedSPSForTelemetry && mp4_demuxer::H264::HasSPS(sample)) { if (mNeedSPSForTelemetry && mp4_demuxer::H264::HasSPS(sample->mExtraData)) {
RefPtr<MediaByteBuffer> extradata = RefPtr<MediaByteBuffer> extradata =
mp4_demuxer::H264::ExtractExtraData(sample); mp4_demuxer::H264::ExtractExtraData(sample);
mNeedSPSForTelemetry = AccumulateSPSTelemetry(extradata); mNeedSPSForTelemetry = AccumulateSPSTelemetry(extradata);

Просмотреть файл

@ -783,12 +783,6 @@ H264::ExtractExtraData(const mozilla::MediaRawData* aSample)
return extradata.forget(); return extradata.forget();
} }
/* static */ bool
H264::HasSPS(const mozilla::MediaRawData* aSample)
{
return HasSPS(aSample->mExtraData);
}
/* static */ bool /* static */ bool
H264::HasSPS(const mozilla::MediaByteBuffer* aExtraData) H264::HasSPS(const mozilla::MediaByteBuffer* aExtraData)
{ {

Просмотреть файл

@ -414,7 +414,6 @@ public:
const mozilla::MediaByteBuffer* aNAL); const mozilla::MediaByteBuffer* aNAL);
/* Check if out of band extradata contains a SPS NAL */ /* Check if out of band extradata contains a SPS NAL */
static bool HasSPS(const mozilla::MediaRawData* aSample);
static bool HasSPS(const mozilla::MediaByteBuffer* aExtraData); static bool HasSPS(const mozilla::MediaByteBuffer* aExtraData);
// Extract SPS and PPS NALs from aSample by looking into each NALs. // Extract SPS and PPS NALs from aSample by looking into each NALs.
// aSample must be in AVCC format. // aSample must be in AVCC format.