virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Changed indexing in libopenjpeg to shorten lines

Browse Source
This commit is contained in:
Michael Bradshaw 2012-01-19 23:15:56 +01:00 committed by Carl Eugen Hoyos
parent df42dd7323
commit de07355026
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/libopenjpegenc.c
View File

@ -206,6 +206,8 @@ static int libopenjpeg_copy_packed8(AVCodecContext *avctx, AVFrame *frame, opj_i
int compno; int compno;
int x; int x;
int y; int y;
int image_index;
int frame_index;
const int numcomps = image->numcomps; const int numcomps = image->numcomps;
for (compno = 0; compno < numcomps; ++compno) { for (compno = 0; compno < numcomps; ++compno) {
@ -217,8 +219,11 @@ static int libopenjpeg_copy_packed8(AVCodecContext *avctx, AVFrame *frame, opj_i
for (compno = 0; compno < numcomps; ++compno) { for (compno = 0; compno < numcomps; ++compno) {
for (y = 0; y < avctx->height; ++y) { for (y = 0; y < avctx->height; ++y) {
image_index = y * avctx->width;
frame_index = y * frame->linesize[0] + compno;
for (x = 0; x < avctx->width; ++x) { for (x = 0; x < avctx->width; ++x) {
image->comps[compno].data[y * avctx->width + x] = frame->data[0][y * frame->linesize[0] + x * numcomps + compno]; image->comps[compno].data[image_index++] = frame->data[0][frame_index];
frame_index += numcomps;
} }
} }
} }
@ -231,6 +236,8 @@ static int libopenjpeg_copy_packed16(AVCodecContext *avctx, AVFrame *frame, opj_
int compno; int compno;
int x; int x;
int y; int y;
int image_index;
int frame_index;
const int numcomps = image->numcomps; const int numcomps = image->numcomps;
uint16_t *frame_ptr = (uint16_t*)frame->data[0]; uint16_t *frame_ptr = (uint16_t*)frame->data[0];
@ -243,8 +250,11 @@ static int libopenjpeg_copy_packed16(AVCodecContext *avctx, AVFrame *frame, opj_
for (compno = 0; compno < numcomps; ++compno) { for (compno = 0; compno < numcomps; ++compno) {
for (y = 0; y < avctx->height; ++y) { for (y = 0; y < avctx->height; ++y) {
image_index = y * avctx->width;
frame_index = y * (frame->linesize[0] / 2) + compno;
for (x = 0; x < avctx->width; ++x) { for (x = 0; x < avctx->width; ++x) {
image->comps[compno].data[y * avctx->width + x] = frame_ptr[y * frame->linesize[0] / 2 + x * numcomps + compno]; image->comps[compno].data[image_index++] = frame_ptr[frame_index];
frame_index += numcomps;
} }
} }
} }
@ -259,6 +269,8 @@ static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, AVFrame *frame, opj
int y; int y;
int width; int width;
int height; int height;
int image_index;
int frame_index;
const int numcomps = image->numcomps; const int numcomps = image->numcomps;
for (compno = 0; compno < numcomps; ++compno) { for (compno = 0; compno < numcomps; ++compno) {
@ -272,8 +284,10 @@ static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, AVFrame *frame, opj
width = avctx->width / image->comps[compno].dx; width = avctx->width / image->comps[compno].dx;
height = avctx->height / image->comps[compno].dy; height = avctx->height / image->comps[compno].dy;
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
image_index = y * width;
frame_index = y * frame->linesize[compno];
for (x = 0; x < width; ++x) { for (x = 0; x < width; ++x) {
image->comps[compno].data[y * width + x] = frame->data[compno][y * frame->linesize[compno] + x]; image->comps[compno].data[image_index++] = frame->data[compno][frame_index++];
} }
} }
} }
@ -288,6 +302,8 @@ static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, AVFrame *frame, op
int y; int y;
int width; int width;
int height; int height;
int image_index;
int frame_index;
const int numcomps = image->numcomps; const int numcomps = image->numcomps;
uint16_t *frame_ptr; uint16_t *frame_ptr;
@ -303,8 +319,10 @@ static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, AVFrame *frame, op
height = avctx->height / image->comps[compno].dy; height = avctx->height / image->comps[compno].dy;
frame_ptr = (uint16_t*)frame->data[compno]; frame_ptr = (uint16_t*)frame->data[compno];
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
image_index = y * width;
frame_index = y * (frame->linesize[compno] / 2);
for (x = 0; x < width; ++x) { for (x = 0; x < width; ++x) {
image->comps[compno].data[y * width + x] = frame_ptr[y * (frame->linesize[compno] / 2) + x]; image->comps[compno].data[image_index++] = frame_ptr[frame_index++];
} }
} }
} }