Commits · 3bd71f14a09d86ad302fbd6e0b2b57ab9799fbc3 · 胡斌 / merge_av

18 Apr, 2018 2 commits
- add command parameter "-c",to support only convert mp4 to ts · 3bd71f14 ...
  3bd71f14 浏览文件
```
set the version to 1.1.0
```
  胡斌 authored 2018-04-18 20:13:21 +0800
- add test file for only convert mp4 · 14199160
  14199160 浏览文件
  
  胡斌 authored 2018-04-18 20:12:46 +0800
17 Apr, 2018 4 commits
- fix compile error in linux · d287ed72
  d287ed72 Browse Directory
  
  胡斌 authored 2018-04-17 19:25:03 +0800
- remove unused files · 66df1f18
  66df1f18 Browse Directory
  
  胡斌 authored 2018-04-17 19:24:18 +0800
- for mp4 file, convert to ts,and then to mkv to get the correct duration · 76d91c90
  76d91c90 Browse Directory
  
  胡斌 authored 2018-04-17 18:23:06 +0800
- add test file for geting the correct duration when the duraion infomation in mp4 file is error · 3499b851
  3499b851 浏览文件
  
  胡斌 authored 2018-04-17 18:16:37 +0800
10 Feb, 2018 5 commits
- enlarge the pip to w=96:h=72 · a135efee
  a135efee 浏览文件
  
  胡斌 authored 2018-02-10 15:03:13 +0800
- add test file pip_gynoii_1695936790_111200 for merge_pip · 977a0f1a
  977a0f1a 浏览文件
  
  胡斌 authored 2018-02-10 14:42:37 +0800
- rename pip.cpp to merge_pip.cpp · 958fca25 ...
  958fca25 浏览文件
```
add ReadMe.txt
```
  胡斌 authored 2018-02-10 14:38:17 +0800
- add -n to support only merge pip,that is the input file is the output of merge_av · 0c6be3ac
  0c6be3ac 浏览文件
  
  胡斌 authored 2018-02-10 12:49:47 +0800
- read record files and make pip files · 5630963b
  5630963b 浏览文件
  
  胡斌 authored 2018-02-10 11:36:00 +0800
09 Feb, 2018 2 commits
- part of merge the code of merge_av and merge_pip,not finished · 52e59565
  52e59565 Browse Directory
  
  胡斌 authored 2018-02-09 22:53:02 +0800
- rewrite merge logic,don't use pip when there is only one video · ff7eb97f
  ff7eb97f Browse Directory
  
  胡斌 authored 2018-02-09 19:08:54 +0800
08 Feb, 2018 2 commits
- first version · 04bc3145
  04bc3145 Browse Directory
  
  胡斌 authored 2018-02-08 21:11:44 +0800
- part of pip,not finished · 3127bdd5
  3127bdd5 浏览文件
  
  胡斌 authored 2018-02-08 19:35:06 +0800
23 Jan, 2018 3 commits
- use first name · 8da1f2b0
  8da1f2b0 Browse Directory
  
  胡斌 authored 2018-01-23 19:32:40 +0800
- 1.0.8 · 92195054 ...
  92195054 浏览文件
```
using the name of first audio or video as the output ts file's main name
```
  胡斌 authored 2018-01-23 19:16:47 +0800
- v1.0.7,read recordinfo.txt,transcode ,and save recordinfo_out.txt · 65c50087 ...
  65c50087 浏览文件
```
in previous version,all the audio an video are merged to one ts,
in this version,there are maybe serveral ts,if the video file or audio file is not continuous
```
  胡斌 authored 2018-01-23 15:44:24 +0800
30 Dec, 2017 5 commits
- add test file:1_video_2_audio · 4b3234ad
  4b3234ad Browse File
  
  胡斌 authored 2017-12-30 18:58:02 +0800
- remove temp file,set version to 1.0.6 · d64cb084
  d64cb084 浏览文件
  
  胡斌 authored 2017-12-30 18:55:56 +0800
- fix bug of time stamp · a2e9bdaa
  a2e9bdaa 浏览文件
  
  胡斌 authored 2017-12-30 17:14:26 +0800
- seems ok · 4e2099b6
  4e2099b6 浏览文件
  
  胡斌 authored 2017-12-30 16:39:43 +0800
- it is near to finish · 16199290
  16199290 浏览文件
  
  胡斌 authored 2017-12-30 15:07:20 +0800
29 Dec, 2017 4 commits
- part of sort · dfc70fc0
  dfc70fc0 浏览文件
  
  胡斌 authored 2017-12-30 07:49:57 +0800
- part of refactor the process · b1638b9c
  b1638b9c 浏览文件
  
  胡斌 authored 2017-12-30 00:24:09 +0800
- need be improved · 3fa8d571
  3fa8d571 浏览文件
  
  胡斌 authored 2017-12-29 23:06:20 +0800
- seems ok · e84f94bd
  e84f94bd 浏览文件
  
  胡斌 authored 2017-12-29 16:05:53 +0800
28 Dec, 2017 1 commit
- unfinished · ceaa6cad
  ceaa6cad 浏览文件
  
  胡斌 authored 2017-12-28 23:22:20 +0800
27 Dec, 2017 2 commits
- add test files:record_without_close · bc9a51a5
  bc9a51a5 Browse Directory
  
  胡斌 authored 2017-12-27 21:14:09 +0800
- ver 1.0.5,support recording file without aac or webm closed · 5b148f14
  5b148f14 浏览文件
  
  胡斌 authored 2017-12-27 21:12:58 +0800
22 Dec, 2017 1 commit
- add silence.aac to support for the recording file having video only · 9ae8ade1 ...
  9ae8ade1 Browse Directory
```
set version to 1.0.4
```
  胡斌 authored 2017-12-22 22:09:05 +0800
12 Dec, 2017 3 commits
- set version to 1.0.3 · d4e8d4ce
  d4e8d4ce Browse Directory
  
  胡斌 authored 2017-12-12 20:43:28 +0800
- add test file for multi audio file · f804ea28
  f804ea28 Browse Directory
  
  胡斌 authored 2017-12-12 20:36:47 +0800
- process multi audio files · b5d3047d
  b5d3047d Browse Directory
  
  胡斌 authored 2017-12-12 16:43:32 +0800
08 Dec, 2017 1 commit
- adjust default video codec param,using cfr,frame rate 20 and key frame interval 100 · a8c78ed7
  a8c78ed7 Browse Directory
  
  胡斌 authored 2017-12-08 12:32:09 +0800
07 Dec, 2017 4 commits
- improve readme · 55e81cb7
  55e81cb7 Browse Directory
  
  胡斌 authored 2017-12-08 06:57:50 +0800
- 1.convert webm to mkv to parsing the duration · c465d2a2 ...
  c465d2a2 Browse Directory
```
2.using the length parsed from video file,not the length in recording info file
3.append blank video to audio of the last segment if the duration is big than 1s
```
  胡斌 authored 2017-12-07 23:24:48 +0800
- try to avoid the start time is not 0 · 35edaa40
  35edaa40 Browse Directory
  
  胡斌 authored 2017-12-07 19:43:25 +0800
- for the record file only have audio,merge with blank.jpg · 3569f789
  3569f789 Browse File
  
  胡斌 authored 2017-12-07 09:21:38 +0800
01 Dec, 2017 1 commit
- improve help · 6a662776
  6a662776 浏览文件
  
  胡斌 authored 2017-12-01 18:37:25 +0800