walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Added tk->visual_w and tk->visual_h variables, specifying the track's visual presentation size as fixed-point 16.16 values.

This commit is contained in:
Francois-Olivier Devaux 2005-02-09 10:08:48 +00:00
parent 9310f1b4a9
commit 632902d7e3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mj2/mj2.c
View File

@ -255,6 +255,8 @@ int mj2_init_stdmovie(mj2_movie_t * movie)
tk->vsub = 2; /* 4:2:0 */ tk->vsub = 2; /* 4:2:0 */
tk->hoff = 0; tk->hoff = 0;
tk->voff = 0; tk->voff = 0;
tk->visual_w = tk->w << 16;
tk->visual_h = tk->h << 16;
} }
} }
return 0; return 0;
@ -2286,9 +2288,9 @@ void mj2_write_tkhd(mj2_tk_t * tk)
cio_write(tk->trans_matrix[7], 4); cio_write(tk->trans_matrix[7], 4);
cio_write(tk->trans_matrix[8], 4); cio_write(tk->trans_matrix[8], 4);
cio_write(tk->w << 16, 4); /* Video Width */ cio_write(tk->visual_w, 4); /* Video Visual Width */
cio_write(tk->h << 16, 4); /* Video Height */ cio_write(tk->visual_h, 4); /* Video Visual Height */
box.length = cio_tell() - box.init_pos; box.length = cio_tell() - box.init_pos;
cio_seek(box.init_pos); cio_seek(box.init_pos);
@ -2358,9 +2360,9 @@ int mj2_read_tkhd(mj2_tk_t * tk)
tk->trans_matrix[7] = cio_read(4); tk->trans_matrix[7] = cio_read(4);
tk->trans_matrix[8] = cio_read(4); tk->trans_matrix[8] = cio_read(4);
tk->w = cio_read(4) >> 16; /* Video Width */ tk->visual_w = cio_read(4); /* Video Visual Width */
tk->h = cio_read(4) >> 16; /* Video Height */ tk->visual_h = cio_read(4); /* Video Visual Height */
if (cio_tell() - box.init_pos != box.length) { if (cio_tell() - box.init_pos != box.length) {
fprintf(stderr, "Error with TKHD Box size\n"); fprintf(stderr, "Error with TKHD Box size\n");

2
mj2/mj2.h
View File

@ -88,6 +88,8 @@ typedef struct { /* Video Track Parameters */
int Dim[2]; int Dim[2];
int w; int w;
int h; int h;
int visual_w;
int visual_h;
int CbCr_subsampling_dx; int CbCr_subsampling_dx;
int CbCr_subsampling_dy; int CbCr_subsampling_dy;
// int subsampling_dx; // int subsampling_dx;