Skip to content

Commit 6c0fcf4

Browse files
authored
Merge pull request Dash-Industry-Forum#5 from TobbeEdgeware/restructure-for-distribution-packaging
Major restructuring for packaging for PyPi.
2 parents ea4e42f + 72fbae3 commit 6c0fcf4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+333
-350
lines changed

AUTHORS.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* @GitHub UserName (Required) [Name and/or Organization] (Optional)
44

55
#Authors
6+
* @TobbeEdgeware [Torbjörn Einarsson, Edgeware]
67
* @TobbeMobiTV [Torbjörn Einarsson, MobiTV]
78
* @mobiola [Ola Hållmarker, MobiTV]
89
* @KenthMobiTV [Kenth Andersson, MobiTV]

README.md

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
# media-tools
2-
A collection of tools for analyzing, handling, and creating media and media containers.
2+
A collection of tools for analyzing, handling, and creating media and media
3+
containers.
34

4-
Recent additions:
5+
There are two main parts
56

6-
* **create\_ondemand\_dash.py**
7-
* Combination of scripts to generate good DASH on-demand content using ffmpeg and MP4Box
8-
* Aligns audio segments with video segments in an optional way
9-
* More info in [how\_create\_dash\_ondemand.md](python/content_production/how_create_dash_ondemand.md)
10-
* **dashondemand\_verifier.py**
11-
* Checks if an asset or tree of assets are good DASH on-demand assets
12-
* Available at python/content_analyzers
7+
1. Python 2.7 tools for generating, analyzing, fetching DASH media. This is
8+
published as a PyPi module: dash-tools. Install by using
139

14-
These tools have been contributed by members of DASH-IF and are provided as is. They are not to be seen as reference software for DASH.
10+
> pip install dash_mediatools
11+
12+
or clone the parser. For more info, see
13+
[dash_mediatools documentation](python/README.rst)
14+
15+
2. A [Javascript mp4 parser](javascript/README.md)
16+
17+
18+
These tools have been contributed by members of DASH-IF and are provided as is.
19+
They are not to be seen as reference software for DASH.
1520

1621
The contributing companies are (this far):
1722
MobiTV and Edgeware

javascript/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The mp4parser is available online at [http://mp4parser.com](http://mp4parser.com).

python/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
__pycache__/
2+
*.py[cod]

python/LICENSE.txt

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# The copyright in this software is being made available under the BSD License,
2+
# included below. This software may be subject to other third party and contributor
3+
# rights, including patent rights, and no such rights are granted under this license.
4+
#
5+
# Copyright (c) 2016-2017, Dash Industry Forum.
6+
# All rights reserved.
7+
#
8+
# Redistribution and use in source and binary forms, with or without modification,
9+
# are permitted provided that the following conditions are met:
10+
# * Redistributions of source code must retain the above copyright notice, this
11+
# list of conditions and the following disclaimer.
12+
# * Redistributions in binary form must reproduce the above copyright notice,
13+
# this list of conditions and the following disclaimer in the documentation and/or
14+
# other materials provided with the distribution.
15+
# * Neither the name of Dash Industry Forum nor the names of its
16+
# contributors may be used to endorse or promote products derived from this software
17+
# without specific prior written permission.
18+
#
19+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY
20+
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21+
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22+
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
23+
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
24+
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
25+
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
26+
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28+
# POSSIBILITY OF SUCH DAMAGE.

python/MANIFEST.in

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
include LICENSE.txt
2+
3+
# Include the data files
4+
# recursive-include data *

python/Makefile

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
SHELL=/usr/bin/env bash
2+
3+
all: dist
4+
5+
dist:
6+
python setup.py bdist_wheel
7+
8+
clean:
9+
rm -rf build
10+
rm -rf dist
11+
rm -rf dash_mediatools.egg-info

python/README.rst

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
Tools for creating, analyzing, modifying, downloading MPEG-DASH content
2+
=======================================================================
3+
DASH Industry Forum collection of various tools. A lot of them are small and
4+
need to be run directly from the source tree.
5+
6+
Major tools
7+
-----------
8+
9+
**dash-batch-encoder** (dash_tools.bache_encoder)
10+
* Uses *ffmpeg* to create multi-variant mp4 content with fixed
11+
GoP duration
12+
* Output is suitable for transforming into DASH ABR content
13+
* Configured via JSON recipes
14+
15+
**dash-ondemand-creator** (dash_tools.ondemand_creator)
16+
* Uses *MP4Box* to transform the output of dash-batch-encoder into
17+
DASH OnDemand content.
18+
* Postprocesses audio tracks to get segment alignment with video
19+
* Configured via JSON recipy
20+
21+
**dash-ondemand-verifier** (dash_tools.ondemand_verifier)
22+
* Performs checks on (trees of) DASH OnDemand asset and reports issues
23+
24+
**dash-livedownloader** (dash_tools.livedownloader)
25+
* Downloads a live DASH asset and stores on disk. Only supports
26+
$Number$-template
27+
28+
These above tools are exported as scripts starting with prefix dash-.
29+
There corresponding names in the source code does not have that part.
30+
31+
**dashtools.ts**
32+
* This is a competent MPEG-2 TS parser
33+
34+
For more details, see online documentation_.
35+
36+
37+
.. _documentation: https://github.com/Dash-Industry-Forum/media-tools/tree/master/python/doc/dash_tools.rst

python/content_analyzers/.gitignore

-5
This file was deleted.

python/content_production/batch_ffmpeg/README.md

-3
This file was deleted.

python/content_production/batch_ffmpeg/config_HEVC.json

-12
This file was deleted.

python/content_production/batch_ffmpeg/config_only_dash_ondemand.json

-15
This file was deleted.

python/content_production/how_create_dash_ondemand.md

-36
This file was deleted.

0 commit comments

Comments
 (0)