Commits · 86eb158a80cf01bdde42718eb927c2aa19234618 · 胡斌 / merge_av

27 Nov, 2018 1 commit
- finished most of decode flow · 86eb158a
  86eb158a 浏览文件
  
  胡斌 authored 2018-11-27 08:42:28 +0800
22 Nov, 2018 1 commit
- add some code about new merge_pip · ab82a814
  ab82a814 浏览文件
  
  胡斌 authored 2018-11-22 23:39:21 +0800
21 Nov, 2018 1 commit
- first commit of using ffmpeg code · f6f4d7a0
  f6f4d7a0 浏览文件
  
  胡斌 authored 2018-11-21 21:59:59 +0800
20 Nov, 2018 1 commit
- format help · c73db2f8
  c73db2f8 浏览文件
  
  胡斌 authored 2018-11-20 09:03:13 +0800
19 Nov, 2018 1 commit
- 1.add -d to indicate output as individual video segment if the timeline is not continuous · e84bee29 ...
  e84bee29 浏览文件
```
2.support fill blank video with last video frame
```
  胡斌 authored 2018-11-19 20:41:36 +0800
16 Nov, 2018 1 commit
- parsing rotation=180 in record file,rotate the video when merge audio video · 96419df0
  96419df0 浏览文件
  
  胡斌 authored 2018-11-16 23:07:33 +0800
15 Nov, 2018 1 commit
- modify the pip layout,if both teacher and student has video ,teacher at lop,and student at bottom · d06ae0fb
  d06ae0fb 浏览文件
  
  胡斌 authored 2018-11-15 21:15:53 +0800
28 Jun, 2018 4 commits
- for only convert mp4,only get the codec,don't get the true duration · 04e7b37e
  04e7b37e 浏览文件
  
  胡斌 authored 2018-06-28 21:34:12 +0800
- format the help info · 95cb7c20
  95cb7c20 浏览文件
  
  胡斌 authored 2018-06-28 21:00:27 +0800
- set version to 1.2.0 · e98d68f0
  e98d68f0 浏览文件
  
  胡斌 authored 2018-06-28 20:57:16 +0800
- if -t is not passed in command line, if source file codec is h264,use -vcodec copy when transcode · e5dab3e1
  e5dab3e1 Browse File
  
  胡斌 authored 2018-06-28 19:27:37 +0800
18 Apr, 2018 3 commits
- add "\n" for print only convert mp4 · 552f64f7
  552f64f7 浏览文件
  
  胡斌 authored 2018-04-18 20:16:21 +0800
- 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 Browse File
  
  胡斌 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 Browse Directory
  
  胡斌 authored 2018-02-10 12:49:47 +0800
- read record files and make pip files · 5630963b
  5630963b Browse Directory
  
  胡斌 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 浏览文件
  
  胡斌 authored 2018-02-09 22:53:02 +0800
- rewrite merge logic,don't use pip when there is only one video · ff7eb97f
  ff7eb97f 浏览文件
  
  胡斌 authored 2018-02-09 19:08:54 +0800
08 Feb, 2018 2 commits
- first version · 04bc3145
  04bc3145 浏览文件
  
  胡斌 authored 2018-02-08 21:11:44 +0800
- part of pip,not finished · 3127bdd5
  3127bdd5 Browse Directory
  
  胡斌 authored 2018-02-08 19:35:06 +0800
23 Jan, 2018 3 commits
- use first name · 8da1f2b0
  8da1f2b0 浏览文件
  
  胡斌 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 Browse File
```
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 浏览文件
  
  胡斌 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