Mercurial > libavcodec.hg
comparison cabac.h @ 6604:e226f34ca284 libavcodec
Redo r12838, this time using svn copy to create h264_i386.h from cabac.h.
Move decode_significance_x86() and decode_significance_8x8_x86() to
i386-specific file from cabac.h.
New file is h264-oriented and only included from h264.c
Resolves compilation when configured with --disable-optimizations due to
decode_significance_8x8_x86 using last_coeff_flag_offset_8x8, which is
only defined in h264.c
author | heydowns |
---|---|
date | Wed, 16 Apr 2008 04:40:21 +0000 |
parents | b560e57e47ff |
children | f7cbb7733146 |
comparison
equal
deleted
inserted
replaced
6603:b560e57e47ff | 6604:e226f34ca284 |
---|---|
683 c->low += range; | 683 c->low += range; |
684 return (val^mask)-mask; | 684 return (val^mask)-mask; |
685 #endif | 685 #endif |
686 } | 686 } |
687 | 687 |
688 //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!) | |
689 //FIXME use some macros to avoid duplicatin get_cabac (cannot be done yet as that would make optimization work hard) | |
690 #if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) | |
691 static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){ | |
692 void *end= significant_coeff_ctx_base + max_coeff - 1; | |
693 int minusstart= -(int)significant_coeff_ctx_base; | |
694 int minusindex= 4-(int)index; | |
695 int coeff_count; | |
696 asm volatile( | |
697 "movl "RANGE "(%3), %%esi \n\t" | |
698 "movl "LOW "(%3), %%ebx \n\t" | |
699 | |
700 "2: \n\t" | |
701 | |
702 BRANCHLESS_GET_CABAC("%%edx", "%3", "(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") | |
703 | |
704 "test $1, %%edx \n\t" | |
705 " jz 3f \n\t" | |
706 | |
707 BRANCHLESS_GET_CABAC("%%edx", "%3", "61(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") | |
708 | |
709 "mov %2, %%"REG_a" \n\t" | |
710 "movl %4, %%ecx \n\t" | |
711 "add %1, %%"REG_c" \n\t" | |
712 "movl %%ecx, (%%"REG_a") \n\t" | |
713 | |
714 "test $1, %%edx \n\t" | |
715 " jnz 4f \n\t" | |
716 | |
717 "add $4, %%"REG_a" \n\t" | |
718 "mov %%"REG_a", %2 \n\t" | |
719 | |
720 "3: \n\t" | |
721 "add $1, %1 \n\t" | |
722 "cmp %5, %1 \n\t" | |
723 " jb 2b \n\t" | |
724 "mov %2, %%"REG_a" \n\t" | |
725 "movl %4, %%ecx \n\t" | |
726 "add %1, %%"REG_c" \n\t" | |
727 "movl %%ecx, (%%"REG_a") \n\t" | |
728 "4: \n\t" | |
729 "add %6, %%eax \n\t" | |
730 "shr $2, %%eax \n\t" | |
731 | |
732 "movl %%esi, "RANGE "(%3) \n\t" | |
733 "movl %%ebx, "LOW "(%3) \n\t" | |
734 :"=&a"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index) | |
735 :"r"(c), "m"(minusstart), "m"(end), "m"(minusindex) | |
736 : "%"REG_c, "%ebx", "%edx", "%esi", "memory" | |
737 ); | |
738 return coeff_count; | |
739 } | |
740 | |
741 static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coeff_ctx_base, int *index, const uint8_t *sig_off){ | |
742 int minusindex= 4-(int)index; | |
743 int coeff_count; | |
744 long last=0; | |
745 asm volatile( | |
746 "movl "RANGE "(%3), %%esi \n\t" | |
747 "movl "LOW "(%3), %%ebx \n\t" | |
748 | |
749 "mov %1, %%"REG_D" \n\t" | |
750 "2: \n\t" | |
751 | |
752 "mov %6, %%"REG_a" \n\t" | |
753 "movzbl (%%"REG_a", %%"REG_D"), %%edi \n\t" | |
754 "add %5, %%"REG_D" \n\t" | |
755 | |
756 BRANCHLESS_GET_CABAC("%%edx", "%3", "(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") | |
757 | |
758 "mov %1, %%edi \n\t" | |
759 "test $1, %%edx \n\t" | |
760 " jz 3f \n\t" | |
761 | |
762 "movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%%edi), %%edi\n\t" | |
763 "add %5, %%"REG_D" \n\t" | |
764 | |
765 BRANCHLESS_GET_CABAC("%%edx", "%3", "15(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") | |
766 | |
767 "mov %2, %%"REG_a" \n\t" | |
768 "mov %1, %%edi \n\t" | |
769 "movl %%edi, (%%"REG_a") \n\t" | |
770 | |
771 "test $1, %%edx \n\t" | |
772 " jnz 4f \n\t" | |
773 | |
774 "add $4, %%"REG_a" \n\t" | |
775 "mov %%"REG_a", %2 \n\t" | |
776 | |
777 "3: \n\t" | |
778 "addl $1, %%edi \n\t" | |
779 "mov %%edi, %1 \n\t" | |
780 "cmpl $63, %%edi \n\t" | |
781 " jb 2b \n\t" | |
782 "mov %2, %%"REG_a" \n\t" | |
783 "movl %%edi, (%%"REG_a") \n\t" | |
784 "4: \n\t" | |
785 "addl %4, %%eax \n\t" | |
786 "shr $2, %%eax \n\t" | |
787 | |
788 "movl %%esi, "RANGE "(%3) \n\t" | |
789 "movl %%ebx, "LOW "(%3) \n\t" | |
790 :"=&a"(coeff_count),"+m"(last), "+m"(index) | |
791 :"r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off) | |
792 : "%"REG_c, "%ebx", "%edx", "%esi", "%"REG_D, "memory" | |
793 ); | |
794 return coeff_count; | |
795 } | |
796 #endif /* defined(ARCH_X86) && && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ | |
797 | |
798 /** | 688 /** |
799 * | 689 * |
800 * @return the number of bytes read or 0 if no end | 690 * @return the number of bytes read or 0 if no end |
801 */ | 691 */ |
802 static int get_cabac_terminate(CABACContext *c){ | 692 static int get_cabac_terminate(CABACContext *c){ |