Use memcpy() where appropriate in PS stereo processing remapping.
authorAlex Converse <alex.converse@gmail.com>
Sun, 20 Jun 2010 20:06:41 +0000 (20:06 +0000)
committerAlex Converse <alex.converse@gmail.com>
Sun, 20 Jun 2010 20:06:41 +0000 (20:06 +0000)
Originally committed as revision 23662 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/ps.c

index acf8c7d..3a66d09 100644 (file)
@@ -812,16 +812,14 @@ static void stereo_processing(PSContext *ps, float (*l)[32][2], float (*r)[32][2
     const float (*H_LUT)[8][4] = (PS_BASELINE || ps->icc_mode < 3) ? HA : HB;
 
     //Remapping
-    for (b = 0; b < PS_MAX_NR_IIDICC; b++) {
-        H11[0][0][b] = H11[0][ps->num_env_old][b];
-        H12[0][0][b] = H12[0][ps->num_env_old][b];
-        H21[0][0][b] = H21[0][ps->num_env_old][b];
-        H22[0][0][b] = H22[0][ps->num_env_old][b];
-        H11[1][0][b] = H11[1][ps->num_env_old][b];
-        H12[1][0][b] = H12[1][ps->num_env_old][b];
-        H21[1][0][b] = H21[1][ps->num_env_old][b];
-        H22[1][0][b] = H22[1][ps->num_env_old][b];
-    }
+    memcpy(H11[0][0], H11[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H11[0][0][0]));
+    memcpy(H11[1][0], H11[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H11[1][0][0]));
+    memcpy(H12[0][0], H12[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H12[0][0][0]));
+    memcpy(H12[1][0], H12[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H12[1][0][0]));
+    memcpy(H21[0][0], H21[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H21[0][0][0]));
+    memcpy(H21[1][0], H21[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H21[1][0][0]));
+    memcpy(H22[0][0], H22[0][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H22[0][0][0]));
+    memcpy(H22[1][0], H22[1][ps->num_env_old], PS_MAX_NR_IIDICC*sizeof(H22[1][0][0]));
     if (is34) {
         remap34(&iid_mapped, ps->iid_par, ps->nr_iid_par, ps->num_env, 1);
         remap34(&icc_mapped, ps->icc_par, ps->nr_icc_par, ps->num_env, 1);