diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-09-14 16:14:07 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2011-09-14 16:28:44 -0700 |
| commit | b3757d3167eb4c57b02d83cb9cf9cfcf112c2a53 (patch) | |
| tree | 4cb761a547505be5a08aededac2782ebf0a4778e /data/videos | |
| parent | aeb116750110cf9cc1ef82d208f3a8ba3b8be009 (diff) | |
| download | frameworks_base-b3757d3167eb4c57b02d83cb9cf9cfcf112c2a53.zip frameworks_base-b3757d3167eb4c57b02d83cb9cf9cfcf112c2a53.tar.gz frameworks_base-b3757d3167eb4c57b02d83cb9cf9cfcf112c2a53.tar.bz2 | |
Add 480p default videos into the system.
There are two sets of 480p videos.
The lower-quality videos are referenced in
VideoPackage1.mk, while higher-quality versions
are referenced in VideoPackage2.mk.
Change-Id: I4d1cec94b677a67abe0ccbbd9a7002995cfcf7bb
Diffstat (limited to 'data/videos')
| -rwxr-xr-x | data/videos/AndroidInSpace.480p.lq.mp4 | bin | 0 -> 1506932 bytes | |||
| -rwxr-xr-x | data/videos/AndroidInSpace.480p.mq.mp4 | bin | 0 -> 2884674 bytes | |||
| -rw-r--r-- | data/videos/Sunset.480p.lq.mp4 | bin | 0 -> 1598754 bytes | |||
| -rw-r--r-- | data/videos/Sunset.480p.mq.mp4 | bin | 0 -> 2899702 bytes | |||
| -rw-r--r-- | data/videos/VideoPackage1.mk | 8 | ||||
| -rw-r--r-- | data/videos/VideoPackage2.mk | 27 |
6 files changed, 33 insertions, 2 deletions
diff --git a/data/videos/AndroidInSpace.480p.lq.mp4 b/data/videos/AndroidInSpace.480p.lq.mp4 Binary files differnew file mode 100755 index 0000000..f1db694 --- /dev/null +++ b/data/videos/AndroidInSpace.480p.lq.mp4 diff --git a/data/videos/AndroidInSpace.480p.mq.mp4 b/data/videos/AndroidInSpace.480p.mq.mp4 Binary files differnew file mode 100755 index 0000000..5f4cfb3 --- /dev/null +++ b/data/videos/AndroidInSpace.480p.mq.mp4 diff --git a/data/videos/Sunset.480p.lq.mp4 b/data/videos/Sunset.480p.lq.mp4 Binary files differnew file mode 100644 index 0000000..7f9d6a1 --- /dev/null +++ b/data/videos/Sunset.480p.lq.mp4 diff --git a/data/videos/Sunset.480p.mq.mp4 b/data/videos/Sunset.480p.mq.mp4 Binary files differnew file mode 100644 index 0000000..7691544 --- /dev/null +++ b/data/videos/Sunset.480p.mq.mp4 diff --git a/data/videos/VideoPackage1.mk b/data/videos/VideoPackage1.mk index daff26f..1e7096a 100644 --- a/data/videos/VideoPackage1.mk +++ b/data/videos/VideoPackage1.mk @@ -14,10 +14,14 @@ # limitations under the License. # +# Lower-quality videos for space-constrained devices + LOCAL_PATH := frameworks/base/data/videos TARGET_PATH := system/media/video PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ - $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 + $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ + $(LOCAL_PATH)/AndroidInSpace.480p.lq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ + $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ + $(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 diff --git a/data/videos/VideoPackage2.mk b/data/videos/VideoPackage2.mk new file mode 100644 index 0000000..cb77b3e --- /dev/null +++ b/data/videos/VideoPackage2.mk @@ -0,0 +1,27 @@ +# +# Copyright (C) 2011 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Good-quality videos for non-space-constrained devices + +LOCAL_PATH := frameworks/base/data/videos +TARGET_PATH := system/media/video + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ + $(LOCAL_PATH)/AndroidInSpace.480p.mq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ + $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ + $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 + |