stephenseo/EN605.617.81.FA21_StephenSeo_DitheringProject
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle use of ffmpeg deprecated function

Browse source
This commit is contained in:
Stephen Seo 2024-06-24 13:20:21 +09:00
parent 00703f8299
commit 49071365f7
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/video.cc
View file

@ -265,7 +265,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
return_value = avcodec_open2(enc_codec_context, enc_codec, nullptr); return_value = avcodec_open2(enc_codec_context, enc_codec, nullptr);
if (return_value != 0) { if (return_value != 0) {
std::cout << "ERROR: Failed to init enc_codec_context" << std::endl; std::cout << "ERROR: Failed to init enc_codec_context" << std::endl;
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
avformat_free_context(avf_enc_context); avformat_free_context(avf_enc_context);
av_frame_free(&frame); av_frame_free(&frame);
av_packet_free(&pkt); av_packet_free(&pkt);
@ -279,7 +279,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
if (return_value < 0) { if (return_value < 0) {
std::cout << "ERROR: Failed to set encoding codec parameters in stream" std::cout << "ERROR: Failed to set encoding codec parameters in stream"
<< std::endl; << std::endl;
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
avformat_free_context(avf_enc_context); avformat_free_context(avf_enc_context);
av_frame_free(&frame); av_frame_free(&frame);
av_packet_free(&pkt); av_packet_free(&pkt);
@ -298,7 +298,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
if (return_value < 0) { if (return_value < 0) {
std::cout << "ERROR: Failed to open file \"" << output_filename std::cout << "ERROR: Failed to open file \"" << output_filename
<< "\" for writing" << std::endl; << "\" for writing" << std::endl;
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
avformat_free_context(avf_enc_context); avformat_free_context(avf_enc_context);
av_frame_free(&frame); av_frame_free(&frame);
av_packet_free(&pkt); av_packet_free(&pkt);
@ -313,7 +313,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
if (return_value < 0) { if (return_value < 0) {
std::cout << "ERROR: Failed to write header in output video file" std::cout << "ERROR: Failed to write header in output video file"
<< std::endl; << std::endl;
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
avformat_free_context(avf_enc_context); avformat_free_context(avf_enc_context);
av_frame_free(&frame); av_frame_free(&frame);
av_packet_free(&pkt); av_packet_free(&pkt);
@ -332,7 +332,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
HandleDecodingPacket(codec_ctx, pkt, frame, blue_noise, grayscale, HandleDecodingPacket(codec_ctx, pkt, frame, blue_noise, grayscale,
color_changed, output_as_pngs); color_changed, output_as_pngs);
if (!std::get<0>(ret_tuple)) { if (!std::get<0>(ret_tuple)) {
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
avformat_free_context(avf_enc_context); avformat_free_context(avf_enc_context);
av_frame_free(&frame); av_frame_free(&frame);
av_packet_unref(pkt); av_packet_unref(pkt);
@ -345,7 +345,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
if (!HandleEncodingFrame(avf_enc_context, enc_codec_context, if (!HandleEncodingFrame(avf_enc_context, enc_codec_context,
yuv_frame, enc_stream)) { yuv_frame, enc_stream)) {
av_frame_free(&yuv_frame); av_frame_free(&yuv_frame);
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
avformat_free_context(avf_enc_context); avformat_free_context(avf_enc_context);
av_frame_free(&frame); av_frame_free(&frame);
av_packet_unref(pkt); av_packet_unref(pkt);
@ -366,7 +366,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
HandleDecodingPacket(codec_ctx, nullptr, frame, blue_noise, grayscale, HandleDecodingPacket(codec_ctx, nullptr, frame, blue_noise, grayscale,
color_changed, output_as_pngs); color_changed, output_as_pngs);
if (!std::get<0>(ret_tuple)) { if (!std::get<0>(ret_tuple)) {
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
avformat_free_context(avf_enc_context); avformat_free_context(avf_enc_context);
av_frame_free(&frame); av_frame_free(&frame);
av_packet_free(&pkt); av_packet_free(&pkt);
@ -378,7 +378,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
if (!HandleEncodingFrame(avf_enc_context, enc_codec_context, yuv_frame, if (!HandleEncodingFrame(avf_enc_context, enc_codec_context, yuv_frame,
enc_stream)) { enc_stream)) {
av_frame_free(&yuv_frame); av_frame_free(&yuv_frame);
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
avformat_free_context(avf_enc_context); avformat_free_context(avf_enc_context);
av_frame_free(&frame); av_frame_free(&frame);
av_packet_free(&pkt); av_packet_free(&pkt);
@ -394,7 +394,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
// flush encoder // flush encoder
if (!HandleEncodingFrame(avf_enc_context, enc_codec_context, nullptr, if (!HandleEncodingFrame(avf_enc_context, enc_codec_context, nullptr,
enc_stream)) { enc_stream)) {
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
avformat_free_context(avf_enc_context); avformat_free_context(avf_enc_context);
av_frame_free(&frame); av_frame_free(&frame);
av_packet_free(&pkt); av_packet_free(&pkt);
@ -409,7 +409,7 @@ bool Video::DitherVideo(const std::string &output_filename, Image *blue_noise,
// cleanup // cleanup
if (enc_codec_context) { if (enc_codec_context) {
avcodec_close(enc_codec_context); IGPUP_DITHERING_avcodec_close_ctx(&enc_codec_context);
} }
if (!output_as_pngs && !(avf_enc_context->oformat->flags & AVFMT_NOFILE)) { if (!output_as_pngs && !(avf_enc_context->oformat->flags & AVFMT_NOFILE)) {
avio_closep(&avf_enc_context->pb); avio_closep(&avf_enc_context->pb);

8
src/video.h
View file

@ -11,6 +11,14 @@ extern "C" {
#include "image.h" #include "image.h"
inline void IGPUP_DITHERING_avcodec_close_ctx(AVCodecContext **avctx) {
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 3, 100)
avcodec_free_context(avctx);
#else
avcodec_close(*avctx);
#endif
}
constexpr unsigned int kReadBufSize = 4096; constexpr unsigned int kReadBufSize = 4096;
constexpr unsigned int kReadBufPaddingSize = AV_INPUT_BUFFER_PADDING_SIZE; constexpr unsigned int kReadBufPaddingSize = AV_INPUT_BUFFER_PADDING_SIZE;
constexpr unsigned int kReadBufSizeWithPadding = constexpr unsigned int kReadBufSizeWithPadding =