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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: patched-ffmpeg-mt/libavcodec/sh4/dsputil_align.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 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 side-by-side diff with in-line comments
Download patch
« patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c ('K') | « patched-ffmpeg-mt/libavcodec/sbr.h ('k') | patched-ffmpeg-mt/libavcodec/sh4/dsputil_sh4.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patched-ffmpeg-mt/libavcodec/sh4/dsputil_align.c
===================================================================
--- patched-ffmpeg-mt/libavcodec/sh4/dsputil_align.c (revision 41250)
+++ patched-ffmpeg-mt/libavcodec/sh4/dsputil_align.c (working copy)
@@ -23,9 +23,11 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
+#include "dsputil_sh4.h"
#define LP(p) *(uint32_t*)(p)
+#define LPC(p) *(const uint32_t*)(p)
#define UNPACK(ph,pl,tt0,tt1) do { \
@@ -51,14 +53,14 @@
#define OP_C4(ofs) \
ref-=ofs; \
do { \
- OP(LP(dest),MERGE1(LP(ref),LP(ref+4),ofs)); \
+ OP(LP(dest),MERGE1(LPC(ref),LPC(ref+4),ofs)); \
ref+=stride; \
dest+=stride; \
} while(--height)
#define OP_C40() \
do { \
- OP(LP(dest),LP(ref)); \
+ OP(LP(dest),LPC(ref)); \
ref+=stride; \
dest+=stride; \
} while(--height)
@@ -96,15 +98,15 @@
ref-=ofs; \
do { \
uint32_t t0,t1; \
- t0 = LP(ref+0); \
- t1 = LP(ref+4); \
+ t0 = LPC(ref+0); \
+ t1 = LPC(ref+4); \
OP(LP(dest+0), MERGE1(t0,t1,ofs)); \
- t0 = LP(ref+8); \
+ t0 = LPC(ref+8); \
OP(LP(dest+4), MERGE1(t1,t0,ofs)); \
if (sz==16) { \
- t1 = LP(ref+12); \
+ t1 = LPC(ref+12); \
OP(LP(dest+8), MERGE1(t0,t1,ofs)); \
- t0 = LP(ref+16); \
+ t0 = LPC(ref+16); \
OP(LP(dest+12), MERGE1(t1,t0,ofs)); \
} \
ref+=stride; \
@@ -116,11 +118,11 @@
#define OP_C0(sz,avg2) \
{ \
do { \
- OP(LP(dest+0), LP(ref+0)); \
- OP(LP(dest+4), LP(ref+4)); \
+ OP(LP(dest+0), LPC(ref+0)); \
+ OP(LP(dest+4), LPC(ref+4)); \
if (sz==16) { \
- OP(LP(dest+8), LP(ref+8)); \
- OP(LP(dest+12), LP(ref+12)); \
+ OP(LP(dest+8), LPC(ref+8)); \
+ OP(LP(dest+12), LPC(ref+12)); \
} \
ref+=stride; \
dest+= stride; \
@@ -132,15 +134,15 @@
ref-=ofs; \
do { \
uint32_t t0,t1; \
- t0 = LP(ref+0); \
- t1 = LP(ref+4); \
+ t0 = LPC(ref+0); \
+ t1 = LPC(ref+4); \
OP(LP(dest+0), avg2(MERGE1(t0,t1,ofs),MERGE2(t0,t1,ofs))); \
- t0 = LP(ref+8); \
+ t0 = LPC(ref+8); \
OP(LP(dest+4), avg2(MERGE1(t1,t0,ofs),MERGE2(t1,t0,ofs))); \
if (sz==16) { \
- t1 = LP(ref+12); \
+ t1 = LPC(ref+12); \
OP(LP(dest+8), avg2(MERGE1(t0,t1,ofs),MERGE2(t0,t1,ofs))); \
- t0 = LP(ref+16); \
+ t0 = LPC(ref+16); \
OP(LP(dest+12), avg2(MERGE1(t1,t0,ofs),MERGE2(t1,t0,ofs))); \
} \
ref+=stride; \
@@ -153,23 +155,23 @@
{ \
uint32_t t0,t1,t2,t3,t; \
\
- t0 = LP(ref+0); \
- t1 = LP(ref+4); \
+ t0 = LPC(ref+0); \
+ t1 = LPC(ref+4); \
if (sz==16) { \
- t2 = LP(ref+8); \
- t3 = LP(ref+12); \
+ t2 = LPC(ref+8); \
+ t3 = LPC(ref+12); \
} \
do { \
ref += stride; \
\
- t = LP(ref+0); \
+ t = LPC(ref+0); \
OP(LP(dest+0), avg2(t0,t)); t0 = t; \
- t = LP(ref+4); \
+ t = LPC(ref+4); \
OP(LP(dest+4), avg2(t1,t)); t1 = t; \
if (sz==16) { \
- t = LP(ref+8); \
+ t = LPC(ref+8); \
OP(LP(dest+8), avg2(t2,t)); t2 = t; \
- t = LP(ref+12); \
+ t = LPC(ref+12); \
OP(LP(dest+12), avg2(t3,t)); t3 = t; \
} \
dest+= stride; \
@@ -181,32 +183,32 @@
uint32_t t0,t1,t2,t3,t,w0,w1; \
\
ref-=ofs; \
- w0 = LP(ref+0); \
- w1 = LP(ref+4); \
+ w0 = LPC(ref+0); \
+ w1 = LPC(ref+4); \
t0 = MERGE1(w0,w1,ofs); \
- w0 = LP(ref+8); \
+ w0 = LPC(ref+8); \
t1 = MERGE1(w1,w0,ofs); \
if (sz==16) { \
- w1 = LP(ref+12); \
+ w1 = LPC(ref+12); \
t2 = MERGE1(w0,w1,ofs); \
- w0 = LP(ref+16); \
+ w0 = LPC(ref+16); \
t3 = MERGE1(w1,w0,ofs); \
} \
do { \
ref += stride; \
\
- w0 = LP(ref+0); \
- w1 = LP(ref+4); \
+ w0 = LPC(ref+0); \
+ w1 = LPC(ref+4); \
t = MERGE1(w0,w1,ofs); \
OP(LP(dest+0), avg2(t0,t)); t0 = t; \
- w0 = LP(ref+8); \
+ w0 = LPC(ref+8); \
t = MERGE1(w1,w0,ofs); \
OP(LP(dest+4), avg2(t1,t)); t1 = t; \
if (sz==16) { \
- w1 = LP(ref+12); \
+ w1 = LPC(ref+12); \
t = MERGE1(w0,w1,ofs); \
OP(LP(dest+8), avg2(t2,t)); t2 = t; \
- w0 = LP(ref+16); \
+ w0 = LPC(ref+16); \
t = MERGE1(w1,w0,ofs); \
OP(LP(dest+12), avg2(t3,t)); t3 = t; \
} \
@@ -222,34 +224,34 @@
uint32_t a0,a1,a2,a3,a4,a5,a6,a7; \
\
ref -= ofs; \
- w0 = LP(ref+0); \
- w1 = LP(ref+4); \
+ w0 = LPC(ref+0); \
+ w1 = LPC(ref+4); \
UNPACK(a0,a1,MERGE1(w0,w1,ofs),MERGE2(w0,w1,ofs)); \
- w0 = LP(ref+8); \
+ w0 = LPC(ref+8); \
UNPACK(a2,a3,MERGE1(w1,w0,ofs),MERGE2(w1,w0,ofs)); \
if (sz==16) { \
- w1 = LP(ref+12); \
+ w1 = LPC(ref+12); \
UNPACK(a4,a5,MERGE1(w0,w1,ofs),MERGE2(w0,w1,ofs)); \
- w0 = LP(ref+16); \
+ w0 = LPC(ref+16); \
UNPACK(a6,a7,MERGE1(w1,w0,ofs),MERGE2(w1,w0,ofs)); \
} \
do { \
ref+=stride; \
- w0 = LP(ref+0); \
- w1 = LP(ref+4); \
+ w0 = LPC(ref+0); \
+ w1 = LPC(ref+4); \
UNPACK(t2,t3,MERGE1(w0,w1,ofs),MERGE2(w0,w1,ofs)); \
OP(LP(dest+0),PACK(a0,a1,t2,t3)); \
a0 = t2; a1 = t3; \
- w0 = LP(ref+8); \
+ w0 = LPC(ref+8); \
UNPACK(t2,t3,MERGE1(w1,w0,ofs),MERGE2(w1,w0,ofs)); \
OP(LP(dest+4),PACK(a2,a3,t2,t3)); \
a2 = t2; a3 = t3; \
if (sz==16) { \
- w1 = LP(ref+12); \
+ w1 = LPC(ref+12); \
UNPACK(t2,t3,MERGE1(w0,w1,ofs),MERGE2(w0,w1,ofs)); \
OP(LP(dest+8),PACK(a4,a5,t2,t3)); \
a4 = t2; a5 = t3; \
- w0 = LP(ref+16); \
+ w0 = LPC(ref+16); \
UNPACK(t2,t3,MERGE1(w1,w0,ofs),MERGE2(w1,w0,ofs)); \
OP(LP(dest+12),PACK(a6,a7,t2,t3)); \
a6 = t2; a7 = t3; \
« patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c ('K') | « patched-ffmpeg-mt/libavcodec/sbr.h ('k') | patched-ffmpeg-mt/libavcodec/sh4/dsputil_sh4.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698