zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to av_packet_alloc()

Browse Source 
ffmpeg is going to be hiding the implementation of AVPacket, so we can't
allocate them on the stack anymore. av_init_packet is marked deprecated
on TOT ffmpeg, so remove its use everywhere in favor of av_packet_alloc
and av_packet_free.

Bug: chromium:1211508
Change-Id: I154311071123110dd749c71dec1ec2a0452b3908
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217780
Commit-Queue: Ted Meyer <tmathmeyer@google.com>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34106}
This commit is contained in:
Ted Meyer
2021-05-21 12:20:49 -07:00
committed by WebRTC LUCI CQ
parent 0f506780aa
commit 41a111d5b9
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/video_coding/codecs/h264/h264_decoder_impl.cc
View File

@ -54,6 +54,16 @@ enum H264DecoderImplEvent {
kH264DecoderEventMax = 16, kH264DecoderEventMax = 16,
}; };
struct ScopedPtrAVFreePacket {
void operator()(AVPacket* packet) { av_packet_free(&packet); }
};
typedef std::unique_ptr<AVPacket, ScopedPtrAVFreePacket> ScopedAVPacket;
ScopedAVPacket MakeScopedAVPacket() {
ScopedAVPacket packet(av_packet_alloc());
return packet;
}
} // namespace } // namespace
int H264DecoderImpl::AVGetBuffer2(AVCodecContext* context, int H264DecoderImpl::AVGetBuffer2(AVCodecContext* context,
@ -202,7 +212,7 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings,
// a pointer |this|. // a pointer |this|.
av_context_->opaque = this; av_context_->opaque = this;
AVCodec* codec = avcodec_find_decoder(av_context_->codec_id); const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
if (!codec) { if (!codec) {
// This is an indication that FFmpeg has not been initialized or it has not // This is an indication that FFmpeg has not been initialized or it has not
// been compiled/initialized with the correct set of codecs. // been compiled/initialized with the correct set of codecs.
@ -261,21 +271,25 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image,
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
} }
AVPacket packet; ScopedAVPacket packet = MakeScopedAVPacket();
av_init_packet(&packet); if (!packet) {
ReportError();
return WEBRTC_VIDEO_CODEC_ERROR;
}
// packet.data has a non-const type, but isn't modified by // packet.data has a non-const type, but isn't modified by
// avcodec_send_packet. // avcodec_send_packet.
packet.data = const_cast<uint8_t*>(input_image.data()); packet->data = const_cast<uint8_t*>(input_image.data());
if (input_image.size() > if (input_image.size() >
static_cast<size_t>(std::numeric_limits<int>::max())) { static_cast<size_t>(std::numeric_limits<int>::max())) {
ReportError(); ReportError();
return WEBRTC_VIDEO_CODEC_ERROR; return WEBRTC_VIDEO_CODEC_ERROR;
} }
packet.size = static_cast<int>(input_image.size()); packet->size = static_cast<int>(input_image.size());
int64_t frame_timestamp_us = input_image.ntp_time_ms_ * 1000; // ms -> μs int64_t frame_timestamp_us = input_image.ntp_time_ms_ * 1000; // ms -> μs
av_context_->reordered_opaque = frame_timestamp_us; av_context_->reordered_opaque = frame_timestamp_us;
int result = avcodec_send_packet(av_context_.get(), &packet); int result = avcodec_send_packet(av_context_.get(), packet.get());
if (result < 0) { if (result < 0) {
RTC_LOG(LS_ERROR) << "avcodec_send_packet error: " << result; RTC_LOG(LS_ERROR) << "avcodec_send_packet error: " << result;
ReportError(); ReportError();