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

Fix --video-pngs where last frame may not be used

Browse source
This commit is contained in:
Stephen Seo 2021-12-06 15:20:06 +09:00
parent db2d75de06
commit 926269198e
1 changed files with 71 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

142
src/video.cc
View file

@ -487,90 +487,90 @@ std::tuple<bool, std::vector<AVFrame *>> Video::HandleDecodingPacket(
if (!dithered_image->SaveAsPNG(out_name, true)) { if (!dithered_image->SaveAsPNG(out_name, true)) {
return {false, {}}; return {false, {}};
} }
return {true, {}}; } else {
} // convert grayscale/RGBA to YUV444p
if (sws_enc_context_ != nullptr && color_changed) {
// convert grayscale/RGBA to YUV444p // switched between grayscale/RGBA, context needs to be recreated
if (sws_enc_context_ != nullptr && color_changed) { sws_freeContext(sws_enc_context_);
// switched between grayscale/RGBA, context needs to be recreated sws_enc_context_ = nullptr;
sws_freeContext(sws_enc_context_); }
sws_enc_context_ = nullptr; if (sws_enc_context_ == nullptr) {
} sws_enc_context_ = sws_getContext(
if (sws_enc_context_ == nullptr) { frame->width, frame->height,
sws_enc_context_ = sws_getContext( grayscale ? AVPixelFormat::AV_PIX_FMT_GRAY8
frame->width, frame->height, : AVPixelFormat::AV_PIX_FMT_RGBA,
grayscale ? AVPixelFormat::AV_PIX_FMT_GRAY8 frame->width, frame->height, AVPixelFormat::AV_PIX_FMT_YUV444P,
: AVPixelFormat::AV_PIX_FMT_RGBA, SWS_BILINEAR, nullptr, nullptr, nullptr);
frame->width, frame->height, AVPixelFormat::AV_PIX_FMT_YUV444P, if (sws_enc_context_ == nullptr) {
SWS_BILINEAR, nullptr, nullptr, nullptr); std::cout << "ERROR: Failed to init sws_enc_context_" << std::endl;
if (sws_enc_context_ == nullptr) { return {false, {}};
std::cout << "ERROR: Failed to init sws_enc_context_" << std::endl; }
return {false, {}};
} }
}
// rgba data info // rgba data info
if (grayscale) { if (grayscale) {
av_frame_free(&temp_frame); av_frame_free(&temp_frame);
temp_frame = av_frame_alloc(); temp_frame = av_frame_alloc();
temp_frame->format = AVPixelFormat::AV_PIX_FMT_GRAY8; temp_frame->format = AVPixelFormat::AV_PIX_FMT_GRAY8;
temp_frame->width = frame->width; temp_frame->width = frame->width;
temp_frame->height = frame->height; temp_frame->height = frame->height;
return_value = av_frame_get_buffer(temp_frame, 0); return_value = av_frame_get_buffer(temp_frame, 0);
if (return_value != 0) { if (return_value != 0) {
std::cout << "ERROR: Failed to init temp_frame for conversion from "
"grayscale"
<< std::endl;
av_frame_free(&temp_frame);
return {false, {}};
}
std::memcpy(temp_frame->data[0], dithered_image->data_.data(),
frame->width * frame->height);
} else {
temp_frame->format = AVPixelFormat::AV_PIX_FMT_RGBA;
temp_frame->width = frame->width;
temp_frame->height = frame->height;
return_value = av_frame_get_buffer(temp_frame, 0);
if (return_value != 0) {
std::cout
<< "ERROR: Failed to init temp_frame for conversion from RGBA"
<< std::endl;
av_frame_free(&temp_frame);
return {false, {}};
}
std::memcpy(temp_frame->data[0], dithered_image->data_.data(),
4 * frame->width * frame->height);
}
AVFrame *yuv_frame = av_frame_alloc();
if (frame == nullptr) {
std::cout std::cout
<< "ERROR: Failed to init temp_frame for conversion from grayscale" << "ERROR: Failed to alloc AVFrame for receiving YUV444p from RGBA"
<< std::endl; << std::endl;
av_frame_free(&temp_frame); av_frame_free(&temp_frame);
return {false, {}}; return {false, {}};
} }
std::memcpy(temp_frame->data[0], dithered_image->data_.data(), yuv_frame->format = AVPixelFormat::AV_PIX_FMT_YUV444P;
frame->width * frame->height); yuv_frame->width = frame->width;
} else { yuv_frame->height = frame->height;
temp_frame->format = AVPixelFormat::AV_PIX_FMT_RGBA; return_value = av_frame_get_buffer(yuv_frame, 0);
temp_frame->width = frame->width;
temp_frame->height = frame->height; return_value =
return_value = av_frame_get_buffer(temp_frame, 0); sws_scale(sws_enc_context_, temp_frame->data, temp_frame->linesize, 0,
if (return_value != 0) { frame->height, yuv_frame->data, yuv_frame->linesize);
std::cout << "ERROR: Failed to init temp_frame for conversion from RGBA" if (return_value <= 0) {
std::cout << "ERROR: Failed to convert RGBA to YUV444p with sws_scale"
<< std::endl; << std::endl;
av_frame_free(&yuv_frame);
av_frame_free(&temp_frame); av_frame_free(&temp_frame);
return {false, {}}; return {false, {}};
} }
std::memcpy(temp_frame->data[0], dithered_image->data_.data(),
4 * frame->width * frame->height);
}
AVFrame *yuv_frame = av_frame_alloc(); // cleanup
if (frame == nullptr) {
std::cout
<< "ERROR: Failed to alloc AVFrame for receiving YUV444p from RGBA"
<< std::endl;
av_frame_free(&temp_frame); av_frame_free(&temp_frame);
return {false, {}}; yuv_frame->pts = frame_count_ - 1;
} yuv_frame->pkt_duration = 1;
yuv_frame->format = AVPixelFormat::AV_PIX_FMT_YUV444P; return_frames.push_back(yuv_frame);
yuv_frame->width = frame->width; } // else (!output_as_pngs)
yuv_frame->height = frame->height; } // while (return_value >= 0)
return_value = av_frame_get_buffer(yuv_frame, 0);
return_value =
sws_scale(sws_enc_context_, temp_frame->data, temp_frame->linesize, 0,
frame->height, yuv_frame->data, yuv_frame->linesize);
if (return_value <= 0) {
std::cout << "ERROR: Failed to convert RGBA to YUV444p with sws_scale"
<< std::endl;
av_frame_free(&yuv_frame);
av_frame_free(&temp_frame);
return {false, {}};
}
// cleanup
av_frame_free(&temp_frame);
yuv_frame->pts = frame_count_ - 1;
yuv_frame->pkt_duration = 1;
return_frames.push_back(yuv_frame);
}
return {true, return_frames}; return {true, return_frames};
} }