RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-22 15:23:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix writing 12 bit DPX

Browse Source 
The DPX encoder now writes 12 DPX that open correctly (tested with
ImageMagick), and also correspond to the 12 bit sample files at
http://samples.ffmpeg.org/image-samples/dpx_samples.zip

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Georg Lippitsch 2012-10-12 21:18:50 +02:00 committed by Michael Niedermayer
parent 05b7315412
commit 24778c32d8
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/dpxenc.c
View File

@ -104,7 +104,7 @@ static void encode_rgb48_10bit(AVCodecContext *avctx, const AVPicture *pic, uint
for (y = 0; y < avctx->height; y++) { for (y = 0; y < avctx->height; y++) {
for (x = 0; x < avctx->width; x++) { for (x = 0; x < avctx->width; x++) {
int value; int value;
if ((avctx->pix_fmt & 1)) { if (s->big_endian) {
value = ((AV_RB16(src + 6*x + 4) & 0xFFC0) >> 4) value = ((AV_RB16(src + 6*x + 4) & 0xFFC0) >> 4)
| ((AV_RB16(src + 6*x + 2) & 0xFFC0) << 6) | ((AV_RB16(src + 6*x + 2) & 0xFFC0) << 6)
| ((AV_RB16(src + 6*x + 0) & 0xFFC0) << 16); | ((AV_RB16(src + 6*x + 0) & 0xFFC0) << 16);
@ -129,7 +129,7 @@ static void encode_gbrp10(AVCodecContext *avctx, const AVPicture *pic, uint8_t *
for (y = 0; y < avctx->height; y++) { for (y = 0; y < avctx->height; y++) {
for (x = 0; x < avctx->width; x++) { for (x = 0; x < avctx->width; x++) {
int value; int value;
if ((avctx->pix_fmt & 1)) { if (s->big_endian) {
value = (AV_RB16(src[0] + 2*x) << 12) value = (AV_RB16(src[0] + 2*x) << 12)
| (AV_RB16(src[1] + 2*x) << 2) | (AV_RB16(src[1] + 2*x) << 2)
| (AV_RB16(src[2] + 2*x) << 22); | (AV_RB16(src[2] + 2*x) << 22);
@ -148,14 +148,25 @@ static void encode_gbrp10(AVCodecContext *avctx, const AVPicture *pic, uint8_t *
static void encode_gbrp12(AVCodecContext *avctx, const AVPicture *pic, uint16_t *dst) static void encode_gbrp12(AVCodecContext *avctx, const AVPicture *pic, uint16_t *dst)
{ {
DPXContext *s = avctx->priv_data;
const uint16_t *src[3] = {(uint16_t*)pic->data[0], const uint16_t *src[3] = {(uint16_t*)pic->data[0],
(uint16_t*)pic->data[1], (uint16_t*)pic->data[1],
(uint16_t*)pic->data[2]}; (uint16_t*)pic->data[2]};
int x, y, i; int x, y, i;
for (y = 0; y < avctx->height; y++) { for (y = 0; y < avctx->height; y++) {
for (x = 0; x < avctx->width; x++) { for (x = 0; x < avctx->width; x++) {
uint16_t value[3];
if (s->big_endian) {
value[1] = AV_RB16(src[0] + x) << 4;
value[2] = AV_RB16(src[1] + x) << 4;
value[0] = AV_RB16(src[2] + x) << 4;
} else {
value[1] = AV_RL16(src[0] + x) << 4;
value[2] = AV_RL16(src[1] + x) << 4;
value[0] = AV_RL16(src[2] + x) << 4;
}
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
*dst++ = *(src[i] + x); write16(dst++, value[i]);
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
src[i] += pic->linesize[i]/2; src[i] += pic->linesize[i]/2;