hardware/intel/libva
Revision | d5fe363232c4456498282c95f8ec08c67e63a903 (tree) |
---|---|
Zeit | 2013-06-25 14:53:58 |
Autor | Austin Yuan <shengquan.yuan@inte...> |
Commiter | Xiang, Haihao |
h264encode: use frame height not the height from VAImage which may be wrong
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
@@ -1625,7 +1625,7 @@ static int load_surface(VASurfaceID surface_id, unsigned long long display_order | ||
1625 | 1625 | } |
1626 | 1626 | |
1627 | 1627 | /* copy Y plane */ |
1628 | - for (row=0;row<surface_image.height;row++) { | |
1628 | + for (row=0;row<frame_height;row++) { | |
1629 | 1629 | unsigned char *Y_row = Y_start + row * Y_pitch; |
1630 | 1630 | (void)fread(Y_row, 1, surface_image.width, srcyuv_fp); |
1631 | 1631 | } |
@@ -1641,7 +1641,7 @@ static int load_surface(VASurfaceID surface_id, unsigned long long display_order | ||
1641 | 1641 | uv_ptr = malloc(uv_size); |
1642 | 1642 | fread(uv_ptr, uv_size, 1, srcyuv_fp); |
1643 | 1643 | |
1644 | - for (row =0; row < surface_image.height/2; row++) { | |
1644 | + for (row =0; row < frame_height/2; row++) { | |
1645 | 1645 | unsigned char *U_row = U_start + row * U_pitch; |
1646 | 1646 | unsigned char *u_ptr, *v_ptr; |
1647 | 1647 | int j; |
@@ -1770,7 +1770,7 @@ static int storage_task_queue(unsigned long long display_order, unsigned long lo | ||
1770 | 1770 | return 0; |
1771 | 1771 | } |
1772 | 1772 | |
1773 | -static void storage_task(unsigned long long display_order, unsigned long encode_order) | |
1773 | +static void storage_task(unsigned long long display_order, unsigned long long encode_order) | |
1774 | 1774 | { |
1775 | 1775 | unsigned int tmp; |
1776 | 1776 | VAStatus va_status; |