Mercurial > libavcodec.hg

comparison rv10.c @ 5513:9f8219a3b86f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use get_bits1(..) instead get_bits(.., 1)
author alex
date Thu, 09 Aug 2007 00:13:31 +0000
parents d138b2abf3d5
children d2ef80f5fd7e
comparison
equal deleted inserted replaced
5512:28dcc5cd79d2 5513:9f8219a3b86f
193 if (code == 0x7c) { 193 if (code == 0x7c) {
194 code = (int8_t)(get_bits(&s->gb, 7) + 1); 194 code = (int8_t)(get_bits(&s->gb, 7) + 1);
195 } else if (code == 0x7d) { 195 } else if (code == 0x7d) {
196 code = -128 + get_bits(&s->gb, 7); 196 code = -128 + get_bits(&s->gb, 7);
197 } else if (code == 0x7e) { 197 } else if (code == 0x7e) {
198 if (get_bits(&s->gb, 1) == 0) 198 if (get_bits1(&s->gb) == 0)
199 code = (int8_t)(get_bits(&s->gb, 8) + 1); 199 code = (int8_t)(get_bits(&s->gb, 8) + 1);
200 else 200 else
201 code = (int8_t)(get_bits(&s->gb, 8)); 201 code = (int8_t)(get_bits(&s->gb, 8));
202 } else if (code == 0x7f) { 202 } else if (code == 0x7f) {
203 get_bits(&s->gb, 11); 203 get_bits(&s->gb, 11);
310 static int rv10_decode_picture_header(MpegEncContext *s) 310 static int rv10_decode_picture_header(MpegEncContext *s)
311 { 311 {
312 int mb_count, pb_frame, marker, unk, mb_xy; 312 int mb_count, pb_frame, marker, unk, mb_xy;
313 313
314 //printf("ff:%d\n", full_frame); 314 //printf("ff:%d\n", full_frame);
315 marker = get_bits(&s->gb, 1); 315 marker = get_bits1(&s->gb);
316 316
317 if (get_bits(&s->gb, 1)) 317 if (get_bits1(&s->gb))
318 s->pict_type = P_TYPE; 318 s->pict_type = P_TYPE;
319 else 319 else
320 s->pict_type = I_TYPE; 320 s->pict_type = I_TYPE;
321 //printf("h:%X ver:%d\n",h,s->rv10_version); 321 //printf("h:%X ver:%d\n",h,s->rv10_version);
322 if(!marker) av_log(s->avctx, AV_LOG_ERROR, "marker missing\n"); 322 if(!marker) av_log(s->avctx, AV_LOG_ERROR, "marker missing\n");
323 pb_frame = get_bits(&s->gb, 1); 323 pb_frame = get_bits1(&s->gb);
324 324
325 #ifdef DEBUG 325 #ifdef DEBUG
326 av_log(s->avctx, AV_LOG_DEBUG, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame); 326 av_log(s->avctx, AV_LOG_DEBUG, "pict_type=%d pb_frame=%d\n", s->pict_type, pb_frame);
327 #endif 327 #endif
328 328
414 if(s->last_picture_ptr==NULL && s->pict_type==B_TYPE){ 414 if(s->last_picture_ptr==NULL && s->pict_type==B_TYPE){
415 av_log(s->avctx, AV_LOG_ERROR, "early B pix\n"); 415 av_log(s->avctx, AV_LOG_ERROR, "early B pix\n");
416 return -1; 416 return -1;
417 } 417 }
418 418
419 if (get_bits(&s->gb, 1)){ 419 if (get_bits1(&s->gb)){
420 av_log(s->avctx, AV_LOG_ERROR, "unknown bit set\n"); 420 av_log(s->avctx, AV_LOG_ERROR, "unknown bit set\n");
421 return -1; 421 return -1;
422 } 422 }
423 423
424 s->qscale = get_bits(&s->gb, 5); 424 s->qscale = get_bits(&s->gb, 5);
425 if(s->qscale==0){ 425 if(s->qscale==0){
426 av_log(s->avctx, AV_LOG_ERROR, "error, qscale:0\n"); 426 av_log(s->avctx, AV_LOG_ERROR, "error, qscale:0\n");
427 return -1; 427 return -1;
428 } 428 }
429 if(s->avctx->sub_id == 0x30203002){ 429 if(s->avctx->sub_id == 0x30203002){
430 if (get_bits(&s->gb, 1)){ 430 if (get_bits1(&s->gb)){
431 av_log(s->avctx, AV_LOG_ERROR, "unknown bit2 set\n"); 431 av_log(s->avctx, AV_LOG_ERROR, "unknown bit2 set\n");
432 return -1; 432 return -1;
433 } 433 }
434 } 434 }
435 435
436 if(s->avctx->has_b_frames){ 436 if(s->avctx->has_b_frames){
437 int f, new_w, new_h; 437 int f, new_w, new_h;
438 int v= s->avctx->extradata_size >= 4 ? 7&((uint8_t*)s->avctx->extradata)[1] : 0; 438 int v= s->avctx->extradata_size >= 4 ? 7&((uint8_t*)s->avctx->extradata)[1] : 0;
439 439
440 if (get_bits(&s->gb, 1)){ 440 if (get_bits1(&s->gb)){
441 av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n"); 441 av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n");
442 // return -1; 442 // return -1;
443 } 443 }
444 seq= get_bits(&s->gb, 13)<<2; 444 seq= get_bits(&s->gb, 13)<<2;
445 445