Changes between Version 10 and Version 11 of GENIEducation/SampleAssignments/VLCDashTutorial/Execute


Ignore:
Timestamp:
03/27/14 22:35:15 (8 years ago)
Author:
divyashri.bhat@gmail.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • GENIEducation/SampleAssignments/VLCDashTutorial/Execute

    v10 v11  
    9292=== 2.4.1 OML Script ===
    9393{{{
    94 defApplication('test:app:vlc', 'vlc') do |app|
    95 
    96    app.path = "/usr/local/bin/vlc"
     94defApplication('vlc') do |app|
     95
     96   app.binary_path = "/usr/local/bin/vlc"
    9797#   app.path = "/home/cong/work/vlc-2.1.0-git/bin/vlc-static"
    98    app.version(2, 1, 0)
    99    app.shortDescription = "VLC"
     98   #app.version(2, 1, 0)
     99   #app.shortDescription = "VLC"
    100100   app.description = "VLC multimedia player and streamer"
    101101
    102    app.defProperty("input", "Stream input (e.g. file or network address)", nil,
     102   app.defProperty("input", "Stream input (e.g. file or network address)", "",
    103103                   {:type => :string, :dynamic => false})
    104104#   app.defProperty("sout", "Stream output", "--sout",
     
    131131end
    132132
    133 defProperty('theOne','Node0','ID of sender node')
     133defProperty('theOne','inside-vlctest','ID sender node')
    134134
    135135#defProperty('packetsize', 128, "Packet size (byte) from the sender node")
    136136#defProperty('bitrate', 2048, "Bitrate (bit/s) from the sender node")
    137137#defProperty('runtime', 40, "Time in second for the experiment is to run")
    138 defProperty('graph', true, "Display graph or not")
    139138defProperty('duration', 100, "Duration of experiment")
    140139
    141140defGroup('Sender',property.theOne) do |node|
    142   node.addApplication("test:app:vlc") do |app|
     141  node.addApplication("vlc") do |app|
    143142#    app.setProperty('quiet', true)
    144143#    app.setProperty('play-and-exit', false)
    145     app.setProperty('intf', 'dummy')
     144    #app.setProperty('intf', 'dummy')
    146145#    app.setProperty('extraintf', 'omlstats')
    147     app.setProperty('input', 'http://192.168.2.53/DASH_BuckBunny/www-itec.uni-klu.ac.at/ftp/datasets/mmsys12/BigBuckBunny/bunny_2s_480p_only/bunny_Desktop.mpd')
     146    app.setProperty('input', 'http://10.10.10.1/www-itec.uni-klu.ac.at/ftp/datasets/mmsys12/BigBuckBunny/bunny_2s_480p_only/bunny_Desktop.mpd')
    148147#    app.setProperty('mtu', '1200')
    149148    app.measure('dashDlSession', :samples =>1)
     
    155154onEvent(:ALL_UP_AND_INSTALLED) do |event|
    156155    info "starting"
    157     wait 5
     156  after 2 do
    158157    allGroups.startApplications
    159     info "All applications started..." 
    160     wait property.duration
    161     wait 5
     158    info "All applications started..."
     159    end
     160  after 100 do
    162161    allGroups.stopApplications
    163162    info "All applications stopped."
    164163    Experiment.done
    165 end
    166 
    167 defGraph 'DashRate1' do |g|
    168   g.ms('dashRateAdaptation').select (:oml_seq, :decisionRate_bps)
    169   g.caption "Dash Rate Adaptation."
    170   g.type 'line_chart3'
    171   g.mapping :x_axis => :oml_seq, :y_axis => :decisionRate_bps
    172   g.xaxis :legend => 'time [s]'
    173   g.yaxis :legend => 'Decision Rate', :ticks => {:format => 's'}
    174 end
     164  end
     165end
     166
     167#defGraph 'DashRate1' do |g|
     168 # g.ms('dashRateAdaptation').select {[:oml_seq, :decisionRate_bps]}
     169  #g.caption "Dash Rate Adaptation."
     170 # g.type 'line_chart3'
     171 # g.mapping :x_axis => :oml_seq, :y_axis => :decisionRate_bps
     172 # g.xaxis :legend => 'time [s]'
     173 # g.yaxis :legend => 'Decision Rate', :ticks => {:format => 's'}
     174#end
    175175
    176176defGraph 'DashRate2' do |g|
    177   g.ms('dashRateAdaptation').select (:oml_seq, :buffer_percent)
     177  g.ms('dashRateAdaptation').select {[:oml_seq, :empiricalRate_bps]}
    178178  g.caption "VLC Buffer Percentage."
    179179  g.type 'line_chart3'
    180   g.mapping :x_axis => :oml_seq, :y_axis => :buffer_percent
     180  g.mapping :x_axis => :oml_seq, :y_axis => :empiricalRate_bps
    181181  g.xaxis :legend => 'time [s]'
    182   g.yaxis :legend => 'Buffer Percentage ', :ticks => {:format => 's'}
     182  g.yaxis :legend => 'Empirical Rate', :ticks => {:format => 's'}
    183183end
    184184
    185185#defGraph 'DashRate3' do |g|
    186 #  g.ms('dashDlSession').select (:oml_seq, :timeChunk_s)
    187 # g.caption "read Chunk."
    188 # g.type 'line_chart3'
    189 # g.mapping :x_axis => :oml_seq, :y_axis => :timeChunk_s
    190 # g.xaxis :legend => 'time [s]'
    191 # g.yaxis :legend => 'read session [bps] ', :ticks => {:format => 's'}
     186 # g.ms('dashDlSession').select {[:oml_seq, :timeChunk_s]}
     187 # g.caption "read Chunk."
     188 # g.type 'line_chart3'
     189 # g.mapping :x_axis => :oml_seq, :y_axis => :timeChunk_s
     190 # g.xaxis :legend => 'time [s]'
     191 # g.yaxis :legend => 'read session [bps] ', :ticks => {:format => 's'}
    192192#end
    193193