openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted ImageMagick code to dynamically calculate the quantum depth, and bitshift between that depth and the 8bit colors for FFmpeg.

Browse Source
This commit is contained in:
Jonathan Thomas
2014-07-03 12:26:02 -05:00
parent 338b0e85e3
commit b224d7d8fa
8 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/FFmpegWriter.cpp
View File

@@ -1222,19 +1222,22 @@ void FFmpegWriter::process_video_packet(tr1::shared_ptr<Frame> frame)
if ( video_st->codec->pix_fmt == PIX_FMT_RGBA || video_st->codec->pix_fmt == PIX_FMT_ARGB || video_st->codec->pix_fmt == PIX_FMT_BGRA )
step = 4; // rgba
// Determine how many bits to shift the color (from ImageMagick to 8bit FFmpeg)
int bit_shift = MAGICKCORE_QUANTUM_DEPTH - 8;
// Fill the AVFrame with RGB image data
int source_total_pixels = source_image_width * source_image_height;
for (int packet = 0, row = 0; packet < source_total_pixels; packet++, row+=step)
{
// Update buffer (which is already linked to the AVFrame: pFrameRGB)
// Each color needs to be 8 bit (so I'm bit shifting the 16 bit ints)
frame_source->data[0][row] = pixel_packets[packet].red >> 8;
frame_source->data[0][row+1] = pixel_packets[packet].green >> 8;
frame_source->data[0][row+2] = pixel_packets[packet].blue >> 8;
frame_source->data[0][row] = pixel_packets[packet].red >> bit_shift;
frame_source->data[0][row+1] = pixel_packets[packet].green >> bit_shift;
frame_source->data[0][row+2] = pixel_packets[packet].blue >> bit_shift;
// Copy alpha channel (if needed)
if (step == 4)
frame_source->data[0][row+3] = pixel_packets[packet].opacity >> 8;
frame_source->data[0][row+3] = pixel_packets[packet].opacity >> bit_shift;
}
// Resize & convert pixel format