Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(941)

Side by Side Diff: source/libvpx/vp8/vp8_cx_iface.c

Issue 290653003: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 else if(comp_data_state == -1) 879 else if(comp_data_state == -1)
880 break; 880 break;
881 881
882 if (size) 882 if (size)
883 { 883 {
884 vpx_codec_pts_t round, delta; 884 vpx_codec_pts_t round, delta;
885 vpx_codec_cx_pkt_t pkt; 885 vpx_codec_cx_pkt_t pkt;
886 VP8_COMP *cpi = (VP8_COMP *)ctx->cpi; 886 VP8_COMP *cpi = (VP8_COMP *)ctx->cpi;
887 887
888 /* Add the frame packet to the list of returned packets. */ 888 /* Add the frame packet to the list of returned packets. */
889 round = (vpx_codec_pts_t)1000000 889 round = (vpx_codec_pts_t)10000000
890 * ctx->cfg.g_timebase.num / 2 - 1; 890 * ctx->cfg.g_timebase.num / 2 - 1;
891 delta = (dst_end_time_stamp - dst_time_stamp); 891 delta = (dst_end_time_stamp - dst_time_stamp);
892 pkt.kind = VPX_CODEC_CX_FRAME_PKT; 892 pkt.kind = VPX_CODEC_CX_FRAME_PKT;
893 pkt.data.frame.pts = 893 pkt.data.frame.pts =
894 (dst_time_stamp * ctx->cfg.g_timebase.den + round) 894 (dst_time_stamp * ctx->cfg.g_timebase.den + round)
895 / ctx->cfg.g_timebase.num / 10000000; 895 / ctx->cfg.g_timebase.num / 10000000;
896 pkt.data.frame.duration = (unsigned long) 896 pkt.data.frame.duration = (unsigned long)
897 ((delta * ctx->cfg.g_timebase.den + round) 897 ((delta * ctx->cfg.g_timebase.den + round)
898 / ctx->cfg.g_timebase.num / 10000000); 898 / ctx->cfg.g_timebase.num / 10000000);
899 pkt.data.frame.flags = lib_flags << 16; 899 pkt.data.frame.flags = lib_flags << 16;
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 { 1302 {
1303 vp8e_usage_cfg_map, /* vpx_codec_enc_cfg_map_t peek_si; */ 1303 vp8e_usage_cfg_map, /* vpx_codec_enc_cfg_map_t peek_si; */
1304 vp8e_encode, /* vpx_codec_encode_fn_t encode; */ 1304 vp8e_encode, /* vpx_codec_encode_fn_t encode; */
1305 vp8e_get_cxdata, /* vpx_codec_get_cx_data_fn_t frame_get; */ 1305 vp8e_get_cxdata, /* vpx_codec_get_cx_data_fn_t frame_get; */
1306 vp8e_set_config, 1306 vp8e_set_config,
1307 NOT_IMPLEMENTED, 1307 NOT_IMPLEMENTED,
1308 vp8e_get_preview, 1308 vp8e_get_preview,
1309 vp8e_mr_alloc_mem, 1309 vp8e_mr_alloc_mem,
1310 } /* encoder functions */ 1310 } /* encoder functions */
1311 }; 1311 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698