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

Side by Side Diff: source/libvpx/examples.mk

Issue 7671004: Update libvpx snapshot to v0.9.7-p1 (Cayuga). (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: '' Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/configure ('k') | source/libvpx/examples/decode_with_partial_drops.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## 1 ##
2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 ## 3 ##
4 ## Use of this source code is governed by a BSD-style license 4 ## Use of this source code is governed by a BSD-style license
5 ## that can be found in the LICENSE file in the root of the source 5 ## that can be found in the LICENSE file in the root of the source
6 ## tree. An additional intellectual property rights grant can be found 6 ## tree. An additional intellectual property rights grant can be found
7 ## in the file PATENTS. All contributing project authors may 7 ## in the file PATENTS. All contributing project authors may
8 ## be found in the AUTHORS file in the root of the source tree. 8 ## be found in the AUTHORS file in the root of the source tree.
9 ## 9 ##
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 twopass_encoder.GUID = 73494FA6-4AF9-4763-8FBB-265C92402FD8 70 twopass_encoder.GUID = 73494FA6-4AF9-4763-8FBB-265C92402FD8
71 twopass_encoder.DESCRIPTION = Two-pass encoder loop 71 twopass_encoder.DESCRIPTION = Two-pass encoder loop
72 GEN_EXAMPLES-$(CONFIG_ENCODERS) += force_keyframe.c 72 GEN_EXAMPLES-$(CONFIG_ENCODERS) += force_keyframe.c
73 force_keyframe.GUID = 3C67CADF-029F-4C86-81F5-D6D4F51177F0 73 force_keyframe.GUID = 3C67CADF-029F-4C86-81F5-D6D4F51177F0
74 force_keyframe.DESCRIPTION = Force generation of keyframes 74 force_keyframe.DESCRIPTION = Force generation of keyframes
75 ifeq ($(CONFIG_DECODERS),yes) 75 ifeq ($(CONFIG_DECODERS),yes)
76 GEN_EXAMPLES-$(CONFIG_ENCODERS) += decode_with_drops.c 76 GEN_EXAMPLES-$(CONFIG_ENCODERS) += decode_with_drops.c
77 endif 77 endif
78 decode_with_drops.GUID = CE5C53C4-8DDA-438A-86ED-0DDD3CDB8D26 78 decode_with_drops.GUID = CE5C53C4-8DDA-438A-86ED-0DDD3CDB8D26
79 decode_with_drops.DESCRIPTION = Drops frames while decoding 79 decode_with_drops.DESCRIPTION = Drops frames while decoding
80 ifeq ($(CONFIG_DECODERS),yes)
81 GEN_EXAMPLES-$(CONFIG_ERROR_CONCEALMENT) += decode_with_partial_drops.c
82 endif
83 decode_with_partial_drops.GUID = 61C2D026-5754-46AC-916F-1343ECC5537E
84 decode_with_partial_drops.DESCRIPTION = Drops parts of frames while decoding
80 GEN_EXAMPLES-$(CONFIG_ENCODERS) += error_resilient.c 85 GEN_EXAMPLES-$(CONFIG_ENCODERS) += error_resilient.c
81 error_resilient.GUID = DF5837B9-4145-4F92-A031-44E4F832E00C 86 error_resilient.GUID = DF5837B9-4145-4F92-A031-44E4F832E00C
82 error_resilient.DESCRIPTION = Error Resiliency Feature 87 error_resilient.DESCRIPTION = Error Resiliency Feature
83 88
84 GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_scalable_patterns.c 89 GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_scalable_patterns.c
85 vp8_scalable_patterns.GUID = 0D6A210B-F482-4D6F-8570-4A9C01ACC88C 90 vp8_scalable_patterns.GUID = 0D6A210B-F482-4D6F-8570-4A9C01ACC88C
86 vp8_scalable_patterns.DESCRIPTION = VP8 Scalable Bitstream Patterns 91 vp8_scalable_patterns.DESCRIPTION = VP8 Scalable Bitstream Patterns
87 GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_set_maps.c 92 GEN_EXAMPLES-$(CONFIG_VP8_ENCODER) += vp8_set_maps.c
88 vp8_set_maps.GUID = ECB2D24D-98B8-4015-A465-A4AF3DCC145F 93 vp8_set_maps.GUID = ECB2D24D-98B8-4015-A465-A4AF3DCC145F
89 vp8_set_maps.DESCRIPTION = VP8 set active and ROI maps 94 vp8_set_maps.DESCRIPTION = VP8 set active and ROI maps
(...skipping 25 matching lines...) Expand all
115 ifeq ($(HAVE_ALT_TREE_LAYOUT),yes) 120 ifeq ($(HAVE_ALT_TREE_LAYOUT),yes)
116 LIB_PATH := $(SRC_PATH_BARE)/../lib 121 LIB_PATH := $(SRC_PATH_BARE)/../lib
117 INC_PATH := $(SRC_PATH_BARE)/../include 122 INC_PATH := $(SRC_PATH_BARE)/../include
118 else 123 else
119 LIB_PATH-yes += $(if $(BUILD_PFX),$(BUILD_PFX),.) 124 LIB_PATH-yes += $(if $(BUILD_PFX),$(BUILD_PFX),.)
120 INC_PATH-$(CONFIG_VP8_DECODER) += $(SRC_PATH_BARE)/vp8 125 INC_PATH-$(CONFIG_VP8_DECODER) += $(SRC_PATH_BARE)/vp8
121 INC_PATH-$(CONFIG_VP8_ENCODER) += $(SRC_PATH_BARE)/vp8 126 INC_PATH-$(CONFIG_VP8_ENCODER) += $(SRC_PATH_BARE)/vp8
122 LIB_PATH := $(call enabled,LIB_PATH) 127 LIB_PATH := $(call enabled,LIB_PATH)
123 INC_PATH := $(call enabled,INC_PATH) 128 INC_PATH := $(call enabled,INC_PATH)
124 endif 129 endif
125 CFLAGS += $(addprefix -I,$(INC_PATH)) 130 INTERNAL_CFLAGS = $(addprefix -I,$(INC_PATH))
126 LDFLAGS += $(addprefix -L,$(LIB_PATH)) 131 INTERNAL_LDFLAGS += $(addprefix -L,$(LIB_PATH))
127 132
128 133
129 # Expand list of selected examples to build (as specified above) 134 # Expand list of selected examples to build (as specified above)
130 UTILS = $(call enabled,UTILS) 135 UTILS = $(call enabled,UTILS)
131 GEN_EXAMPLES = $(call enabled,GEN_EXAMPLES) 136 GEN_EXAMPLES = $(call enabled,GEN_EXAMPLES)
132 ALL_EXAMPLES = $(UTILS) $(GEN_EXAMPLES) 137 ALL_EXAMPLES = $(UTILS) $(GEN_EXAMPLES)
133 UTIL_SRCS = $(foreach ex,$(UTILS),$($(ex:.c=).SRCS)) 138 UTIL_SRCS = $(foreach ex,$(UTILS),$($(ex:.c=).SRCS))
134 ALL_SRCS = $(foreach ex,$(ALL_EXAMPLES),$($(ex:.c=).SRCS)) 139 ALL_SRCS = $(foreach ex,$(ALL_EXAMPLES),$($(ex:.c=).SRCS))
135 CODEC_EXTRA_LIBS=$(sort $(call enabled,CODEC_EXTRA_LIBS)) 140 CODEC_EXTRA_LIBS=$(sort $(call enabled,CODEC_EXTRA_LIBS))
136 141
(...skipping 18 matching lines...) Expand all
155 DIST-BINS-$(NOT_MSVS) += $(addprefix bin/,$(ALL_EXAMPLES:.c=)) 160 DIST-BINS-$(NOT_MSVS) += $(addprefix bin/,$(ALL_EXAMPLES:.c=))
156 INSTALL-BINS-$(NOT_MSVS) += $(addprefix bin/,$(UTILS:.c=)) 161 INSTALL-BINS-$(NOT_MSVS) += $(addprefix bin/,$(UTILS:.c=))
157 DIST-SRCS-yes += $(ALL_SRCS) 162 DIST-SRCS-yes += $(ALL_SRCS)
158 INSTALL-SRCS-yes += $(UTIL_SRCS) 163 INSTALL-SRCS-yes += $(UTIL_SRCS)
159 OBJS-$(NOT_MSVS) += $(if $(BUILD_OBJS),$(call objs,$(ALL_SRCS))) 164 OBJS-$(NOT_MSVS) += $(if $(BUILD_OBJS),$(call objs,$(ALL_SRCS)))
160 BINS-$(NOT_MSVS) += $(addprefix $(BUILD_PFX),$(ALL_EXAMPLES:.c=)) 165 BINS-$(NOT_MSVS) += $(addprefix $(BUILD_PFX),$(ALL_EXAMPLES:.c=))
161 166
162 167
163 # Instantiate linker template for all examples. 168 # Instantiate linker template for all examples.
164 CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx) 169 CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)
170 CODEC_LIB_SUF=$(if $(CONFIG_SHARED),.so,.a)
165 $(foreach bin,$(BINS-yes),\ 171 $(foreach bin,$(BINS-yes),\
166 $(if $(BUILD_OBJS),$(eval $(bin): $(LIB_PATH)/lib$(CODEC_LIB).a))\ 172 $(if $(BUILD_OBJS),$(eval $(bin):\
173 $(LIB_PATH)/lib$(CODEC_LIB)$(CODEC_LIB_SUF)))\
167 $(if $(BUILD_OBJS),$(eval $(call linker_template,$(bin),\ 174 $(if $(BUILD_OBJS),$(eval $(call linker_template,$(bin),\
168 $(call objs,$($(notdir $(bin)).SRCS)) \ 175 $(call objs,$($(notdir $(bin)).SRCS)) \
169 -l$(CODEC_LIB) $(addprefix -l,$(CODEC_EXTRA_LIBS))\ 176 -l$(CODEC_LIB) $(addprefix -l,$(CODEC_EXTRA_LIBS))\
170 )))\ 177 )))\
171 $(if $(LIPO_OBJS),$(eval $(call lipo_bin_template,$(bin))))\ 178 $(if $(LIPO_OBJS),$(eval $(call lipo_bin_template,$(bin))))\
172 ) 179 )
173 180
174 181
175 # Rules to generate the GEN_EXAMPLES sources 182 # Rules to generate the GEN_EXAMPLES sources
176 .PRECIOUS: %.c 183 .PRECIOUS: %.c
(...skipping 30 matching lines...) Expand all
207 define vcproj_template 214 define vcproj_template
208 $(1): $($(1:.vcproj=).SRCS) 215 $(1): $($(1:.vcproj=).SRCS)
209 @echo " [vcproj] $$@" 216 @echo " [vcproj] $$@"
210 $$(SRC_PATH_BARE)/build/make/gen_msvs_proj.sh\ 217 $$(SRC_PATH_BARE)/build/make/gen_msvs_proj.sh\
211 --exe\ 218 --exe\
212 --target=$$(TOOLCHAIN)\ 219 --target=$$(TOOLCHAIN)\
213 --name=$$(@:.vcproj=)\ 220 --name=$$(@:.vcproj=)\
214 --ver=$$(CONFIG_VS_VERSION)\ 221 --ver=$$(CONFIG_VS_VERSION)\
215 --proj-guid=$$($$(@:.vcproj=).GUID)\ 222 --proj-guid=$$($$(@:.vcproj=).GUID)\
216 $$(if $$(CONFIG_STATIC_MSVCRT),--static-crt) \ 223 $$(if $$(CONFIG_STATIC_MSVCRT),--static-crt) \
217 --out=$$@ $$(CFLAGS) $$(LDFLAGS) -l$$(CODEC_LIB) -lwinmm $$^ 224 --out=$$@ $$(INTERNAL_CFLAGS) $$(CFLAGS) \
225 $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -l$$(CODEC_LIB) -lwinmm $$^
218 endef 226 endef
219 PROJECTS-$(CONFIG_MSVS) += $(ALL_EXAMPLES:.c=.vcproj) 227 PROJECTS-$(CONFIG_MSVS) += $(ALL_EXAMPLES:.c=.vcproj)
220 INSTALL-BINS-$(CONFIG_MSVS) += $(foreach p,$(VS_PLATFORMS),\ 228 INSTALL-BINS-$(CONFIG_MSVS) += $(foreach p,$(VS_PLATFORMS),\
221 $(addprefix bin/$(p)/,$(ALL_EXAMPLES:.c=.exe))) 229 $(addprefix bin/$(p)/,$(ALL_EXAMPLES:.c=.exe)))
222 $(foreach proj,$(call enabled,PROJECTS),\ 230 $(foreach proj,$(call enabled,PROJECTS),\
223 $(eval $(call vcproj_template,$(proj)))) 231 $(eval $(call vcproj_template,$(proj))))
224 232
225 233
226 234
227 # 235 #
(...skipping 28 matching lines...) Expand all
256 "pieces like the samples are. Thir sourcre is included here"\ 264 "pieces like the samples are. Thir sourcre is included here"\
257 "for reference. The following utilities are included:" >> $@ 265 "for reference. The following utilities are included:" >> $@
258 @$(foreach ex,$(UTILS:.c=),\ 266 @$(foreach ex,$(UTILS:.c=),\
259 echo " - \subpage example_$(ex) $($(ex).DESCRIPTION)" >> $@;) 267 echo " - \subpage example_$(ex) $($(ex).DESCRIPTION)" >> $@;)
260 @echo "*/" >> $@ 268 @echo "*/" >> $@
261 269
262 CLEAN-OBJS += examples.doxy samples.dox $(ALL_EXAMPLES:.c=.dox) 270 CLEAN-OBJS += examples.doxy samples.dox $(ALL_EXAMPLES:.c=.dox)
263 DOCS-yes += examples.doxy samples.dox $(ALL_EXAMPLES:.c=.dox) 271 DOCS-yes += examples.doxy samples.dox $(ALL_EXAMPLES:.c=.dox)
264 examples.doxy: samples.dox $(ALL_EXAMPLES:.c=.dox) 272 examples.doxy: samples.dox $(ALL_EXAMPLES:.c=.dox)
265 @echo "INPUT += $^" > $@ 273 @echo "INPUT += $^" > $@
OLDNEW
« no previous file with comments | « source/libvpx/configure ('k') | source/libvpx/examples/decode_with_partial_drops.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698