summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@intel.com>2013-04-28 12:34:01 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2013-06-25 13:53:58 +0800
commitd5fe363232c4456498282c95f8ec08c67e63a903 (patch)
treea63609a5f24bc6ff89a86d1472e25b2c845cb837
parente0b5e873ef78829b7b84237125c7b7273fa790e8 (diff)
h264encode: use frame height not the height from VAImage which may be wrong
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
-rw-r--r--test/encode/h264encode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/encode/h264encode.c b/test/encode/h264encode.c
index 8099809..d02045c 100644
--- a/test/encode/h264encode.c
+++ b/test/encode/h264encode.c
@@ -1625,7 +1625,7 @@ static int load_surface(VASurfaceID surface_id, unsigned long long display_order
}
/* copy Y plane */
- for (row=0;row<surface_image.height;row++) {
+ for (row=0;row<frame_height;row++) {
unsigned char *Y_row = Y_start + row * Y_pitch;
(void)fread(Y_row, 1, surface_image.width, srcyuv_fp);
}
@@ -1641,7 +1641,7 @@ static int load_surface(VASurfaceID surface_id, unsigned long long display_order
uv_ptr = malloc(uv_size);
fread(uv_ptr, uv_size, 1, srcyuv_fp);
- for (row =0; row < surface_image.height/2; row++) {
+ for (row =0; row < frame_height/2; row++) {
unsigned char *U_row = U_start + row * U_pitch;
unsigned char *u_ptr, *v_ptr;
int j;
@@ -1770,7 +1770,7 @@ static int storage_task_queue(unsigned long long display_order, unsigned long lo
return 0;
}
-static void storage_task(unsigned long long display_order, unsigned long encode_order)
+static void storage_task(unsigned long long display_order, unsigned long long encode_order)
{
unsigned int tmp;
VAStatus va_status;