Skip to content

Commit

Permalink
Merge pull request #176 from android/caren/media_readme
Browse files Browse the repository at this point in the history
Add README for media samples
  • Loading branch information
calren authored Jul 11, 2024
2 parents 17cb7f9 + 0297543 commit 70d4971
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
24 changes: 24 additions & 0 deletions samples/media/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Media Samples

- [Ultra HDR to HDR video](ultrahdr/src/main/java/com/example/platform/media/ultrahdr/video/UltraHDRToHDRVideo.kt):
Demonstrates converting a series of UltraHDR images into a HDR video.
- [Transformer Video Composition](video/src/main/java/com/example/platform/media/video/TransformerVideoComposition.kt):
Demonstrates concatenation of two video assets and an image using Media3 Transformer library.

## License

```
Copyright 2024 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
https://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.
```
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ import java.util.concurrent.TimeUnit
@UnstableApi
@Sample(
name = "Video Composition using Media3 Transformer",
description = "This sample demonstrates concatenation of two video assets using Media3 " +
"Transformer library.",
description = "This sample demonstrates concatenation of two video assets and an image using" +
" Media3 Transformer library.",
documentation = "https://developer.android.com/guide/topics/media/transformer",
tags = ["Transformer"],
)
Expand Down

0 comments on commit 70d4971

Please sign in to comment.