History

Merge remote-tracking branch 'qatar/master'

* qatar/master: build: remove empty $(OBJS) target build: make rule for linking ff* apply only to these targets build: rearrange some lines in a more logical way s302m: fix resampling for 16 and 24bits. ARM: remove MUL64 and MAC64 inline asm build: clean up .PHONY lists build: move all (un)install* target aliases to toplevel Makefile flvenc: propagate error properly build: remove stale dependency build: do not add CFLAGS-yes to CFLAGS utils.c: fix crash with threading enabled. configure: simplify source_path setup configure: remove --source-path option lavf: deprecate AVFormatParameters.time_base. img2: add framerate private option. img2: add video_size private option. img2: add pixel_format private option. tty: add framerate private option. Conflicts: Makefile configure

Michael Niedermayer committed 15 years ago

Commit 174df6a2 parents 3a1aaf7 b9c6c7c9 files · +86 −76Browse files

Showing the changes to libavcodec (2 of 9 files). Show all

Unified · Split

2 files
  1. libavcodec/arm/mathops.h +1 −30
  2. libavcodec/s302m.c +2 −2
libavcodec/arm/mathops.h+1−30
@@ -28,45 +28,16 @@ · 27 unmodified lines
2828
2929 #if HAVE_INLINE_ASM
3030
31−#define MULH MULH
32−#define MUL64 MUL64
33−
3431 #if HAVE_ARMV6
32+#define MULH MULH
3533 static inline av_const int MULH(int a, int b)
3634 {
3735 int r;
3836 __asm__ ("smmul %0, %1, %2" : "=r"(r) : "r"(a), "r"(b));
3937 return r;
4038 }
41−
42−static inline av_const int64_t MUL64(int a, int b)
43−{
44− int64_t x;
45− __asm__ ("smull %Q0, %R0, %1, %2" : "=r"(x) : "r"(a), "r"(b));
46− return x;
47−}
48−#else
49−static inline av_const int MULH(int a, int b)
50−{
51− int lo, hi;
52− __asm__ ("smull %0, %1, %2, %3" : "=&r"(lo), "=&r"(hi) : "r"(b), "r"(a));
53− return hi;
54−}
55−
56−static inline av_const int64_t MUL64(int a, int b)
57−{
58− int64_t x;
59− __asm__ ("smull %Q0, %R0, %1, %2" : "=&r"(x) : "r"(a), "r"(b));
60− return x;
61−}
6239 #endif
6340
64−static inline av_const int64_t MAC64(int64_t d, int a, int b)
65−{
66− __asm__ ("smlal %Q0, %R0, %1, %2" : "+r"(d) : "r"(a), "r"(b));
67− return d;
68−}
69−#define MAC64(d, a, b) ((d) = MAC64(d, a, b))
7041 #define MLS64(d, a, b) MAC64(d, -(a), b)
7142
7243 #if HAVE_ARMV5TE
libavcodec/s302m.c+2−2
@@ -107,7 +107,7 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data, · 106 unmodified lines
107107 *o++ = (av_reverse[buf[6] & 0xf0] << 28) |
108108 (av_reverse[buf[5]] << 20) |
109109 (av_reverse[buf[4]] << 12) |
110− (av_reverse[buf[3] & 0x0f] << 8);
110+ (av_reverse[buf[3] & 0x0f] << 4);
111111 buf += 7;
112112 }
113113 *data_size = (uint8_t*) o - (uint8_t*) data;
@@ -130,7 +130,7 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data, · 16 unmodified lines
130130 av_reverse[buf[0]];
131131 *o++ = (av_reverse[buf[4] & 0xf0] << 12) |
132132 (av_reverse[buf[3]] << 4) |
133− av_reverse[buf[2] & 0x0f];
133+ (av_reverse[buf[2]] >> 4);
134134 buf += 5;
135135 }
136136 *data_size = (uint8_t*) o - (uint8_t*) data;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t