| OLD | NEW |
| 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 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1171 int ctr_id, | 1171 int ctr_id, |
| 1172 va_list args) | 1172 va_list args) |
| 1173 { | 1173 { |
| 1174 | 1174 |
| 1175 vpx_scaling_mode_t *data = va_arg(args, vpx_scaling_mode_t *); | 1175 vpx_scaling_mode_t *data = va_arg(args, vpx_scaling_mode_t *); |
| 1176 | 1176 |
| 1177 if (data) | 1177 if (data) |
| 1178 { | 1178 { |
| 1179 int res; | 1179 int res; |
| 1180 vpx_scaling_mode_t scalemode = *(vpx_scaling_mode_t *)data ; | 1180 vpx_scaling_mode_t scalemode = *(vpx_scaling_mode_t *)data ; |
| 1181 res = vp8_set_internal_size(ctx->cpi, scalemode.h_scaling_mode, scalemod
e.v_scaling_mode); | 1181 res = vp8_set_internal_size(ctx->cpi, (VPX_SCALING)scalemode.h_scaling_m
ode, (VPX_SCALING)scalemode.v_scaling_mode); |
| 1182 | 1182 |
| 1183 if (!res) | 1183 if (!res) |
| 1184 { | 1184 { |
| 1185 /*force next frame a key frame to effect scaling mode */ | 1185 /*force next frame a key frame to effect scaling mode */ |
| 1186 ctx->next_frame_flag |= FRAMEFLAGS_KEY; | 1186 ctx->next_frame_flag |= FRAMEFLAGS_KEY; |
| 1187 return VPX_CODEC_OK; | 1187 return VPX_CODEC_OK; |
| 1188 } | 1188 } |
| 1189 else | 1189 else |
| 1190 return VPX_CODEC_INVALID_PARAM; | 1190 return VPX_CODEC_INVALID_PARAM; |
| 1191 } | 1191 } |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1308 { | 1308 { |
| 1309 vp8e_usage_cfg_map, /* vpx_codec_enc_cfg_map_t peek_si; */ | 1309 vp8e_usage_cfg_map, /* vpx_codec_enc_cfg_map_t peek_si; */ |
| 1310 vp8e_encode, /* vpx_codec_encode_fn_t encode; */ | 1310 vp8e_encode, /* vpx_codec_encode_fn_t encode; */ |
| 1311 vp8e_get_cxdata, /* vpx_codec_get_cx_data_fn_t frame_get; */ | 1311 vp8e_get_cxdata, /* vpx_codec_get_cx_data_fn_t frame_get; */ |
| 1312 vp8e_set_config, | 1312 vp8e_set_config, |
| 1313 NOT_IMPLEMENTED, | 1313 NOT_IMPLEMENTED, |
| 1314 vp8e_get_preview, | 1314 vp8e_get_preview, |
| 1315 vp8e_mr_alloc_mem, | 1315 vp8e_mr_alloc_mem, |
| 1316 } /* encoder functions */ | 1316 } /* encoder functions */ |
| 1317 }; | 1317 }; |
| OLD | NEW |