zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll libvpx to 8bec177d.

Browse Source 
Also removing update_libvpx.sh as it is not needed when rolling libvpx
in WebRTC.

Verified on try bots.

BUG=

Review URL: https://webrtc-codereview.appspot.com/749004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2652 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org
2012-08-22 07:53:21 +00:00
parent d81d906adf
commit 2143c60315
4 changed files with 4 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -48,7 +48,7 @@ deps = {
From("chromium_deps", "src/third_party/libjpeg_turbo"),
"third_party/libvpx/source/libvpx":
"http://git.chromium.org/webm/libvpx.git@69babd3",
"http://git.chromium.org/webm/libvpx.git@8bec177d",
"third_party/libyuv":
(Var("googlecode_url") % "libyuv") + "/trunk@255",

1
third_party/libvpx/libvpx_srcs_arm_neon.gypi vendored
View File

@ -17,6 +17,7 @@
'source/libvpx/vp8/common/arm/armv6/filter_v6.asm',
'source/libvpx/vp8/common/arm/armv6/idct_blk_v6.c',
'source/libvpx/vp8/common/arm/armv6/idct_v6.asm',
'source/libvpx/vp8/common/arm/armv6/intra4x4_predict_v6.asm',
'source/libvpx/vp8/common/arm/armv6/iwalsh_v6.asm',
'source/libvpx/vp8/common/arm/armv6/loopfilter_v6.asm',
'source/libvpx/vp8/common/arm/armv6/simpleloopfilter_v6.asm',

3
third_party/libvpx/source/config/linux/arm-neon/vpx_rtcd.h vendored
View File

@ -120,7 +120,8 @@ void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char *
#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c
void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, B_PREDICTION_MODE b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
#define vp8_intra4x4_predict vp8_intra4x4_predict_c
void vp8_intra4x4_predict_armv6(unsigned char *Above, unsigned char *yleft, int left_stride, B_PREDICTION_MODE b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
#define vp8_intra4x4_predict vp8_intra4x4_predict_armv6
void vp8_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
#define vp8_mbpost_proc_down vp8_mbpost_proc_down_c

70
third_party/libvpx/update_libvpx.sh vendored
View File

@ -1,70 +0,0 @@
#!/bin/bash -e
#
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# This tool is used to update libvpx source code with the latest git
# repository.
#
# Make sure you run this in a svn checkout of deps/third_party/libvpx!
# Usage:
#
# $ ./update_libvpx.sh [branch]
# Tools required for running this tool:
#
# 1. Linux / Mac
# 2. svn
# 3. git
# Location for the remote git repository.
GIT_REPO="http://git.chromium.org/webm/libvpx.git"
GIT_BRANCH="master"
LIBVPX_SRC_DIR="source/libvpx"
BASE_DIR=`pwd`
if [ -n "$1" ]; then
GIT_BRANCH="$1"
fi
rm -rf $(svn ls $LIBVPX_SRC_DIR)
svn update $LIBVPX_SRC_DIR
cd $LIBVPX_SRC_DIR
# Make sure git doesn't mess up with svn.
echo ".svn" >> .gitignore
# Start a local git repo.
git init
git add .
git commit -a -m "Current libvpx"
# Add the remote repo.
git remote add origin $GIT_REPO
git fetch
add="$(git diff-index --diff-filter=D origin/$GIT_BRANCH | \
tr -s '\t' ' ' | cut -f6 -d\ )"
delete="$(git diff-index --diff-filter=A origin/$GIT_BRANCH | \
tr -s '\t' ' ' | cut -f6 -d\ )"
# Switch the content to the latest git repo.
git checkout -b tot origin/$GIT_BRANCH
# Git is useless now, remove the local git repo.
rm -rf .git
# Update SVN with the added and deleted files.
echo "$add" | xargs -i svn add --parents {}
echo "$delete" | xargs -i svn rm {}
# Find empty directories and remove them from SVN.
find . -type d -empty -not -iwholename '*.svn*' -exec svn rm {} \;
chmod 755 build/make/*.sh build/make/*.pl configure
cd $BASE_DIR